patch-2.1.128 linux/drivers/sound/sgalaxy.c

Next file: linux/drivers/sound/soundcard.c
Previous file: linux/drivers/sound/sb_mixer.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.127/linux/drivers/sound/sgalaxy.c linux/drivers/sound/sgalaxy.c
@@ -29,7 +29,7 @@
 static void sleep( unsigned howlong )
 {
 	current->state   = TASK_INTERRUPTIBLE;
-	schedule(howlong);
+	schedule_timeout(howlong);
 }
 
 #define DPORT 0x80
@@ -108,9 +108,7 @@
 
 	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 )

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov