diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-01-04 16:03:48 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-01-04 16:03:48 +0000 |
| commit | 78c388aed2b7184182c08428db1de6c872d815f5 (patch) | |
| tree | 4b2003b1b4ceb241a17faa995da8dd1004bb8e45 /drivers/sound/sgalaxy.c | |
| parent | eb7a5bf93aaa4be1d7c6181100ab7639e74d67f7 (diff) | |
Merge with Linux 2.1.131 and more MIPS goodies.
(Did I mention that CVS is buggy ...)
Diffstat (limited to 'drivers/sound/sgalaxy.c')
| -rw-r--r-- | drivers/sound/sgalaxy.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/sound/sgalaxy.c b/drivers/sound/sgalaxy.c index 4e5cb870e..baff3e5cc 100644 --- a/drivers/sound/sgalaxy.c +++ b/drivers/sound/sgalaxy.c @@ -29,9 +29,7 @@ static void sleep( unsigned howlong ) { current->state = TASK_INTERRUPTIBLE; - current->timeout = jiffies + howlong; - schedule(); - current->timeout = 0; + schedule_timeout(howlong); } #define DPORT 0x80 @@ -93,7 +91,7 @@ int probe_sgalaxy( struct address_info *ai ) } if ( ad1848_detect( ai->io_base+4, NULL, ai->osp ) ) - return 1; /* The card is already active */ + return probe_ms_sound(ai); /* The card is already active, check irq etc... */ if ( check_region( ai->ai_sgbase, 0x10 ) ) { @@ -110,9 +108,7 @@ int probe_sgalaxy( struct address_info *ai ) sleep( HZ/10 ); - if ( ad1848_detect( ai->io_base+4, NULL, ai->osp ) ) - return 1; - return 0; + return probe_ms_sound(ai); } void attach_sgalaxy( struct address_info *ai ) |