patch-2.3.16 linux/drivers/char/msp3400.c

• Lines: 33
• Date: Tue Aug 31 11:30:48 1999
• Orig file: v2.3.15/linux/drivers/char/msp3400.c
• Orig date: Wed May 12 08:41:07 1999

diff -u --recursive --new-file v2.3.15/linux/drivers/char/msp3400.c linux/drivers/char/msp3400.c
@@ -795,9 +795,8 @@
 		UNLOCK_I2C_BUS(msp->bus);
 
 		/* wait 1 sec */
-		current->state = TASK_INTERRUPTIBLE;
-		current->timeout = jiffies + HZ;
-		schedule();
+		__set_current_state(TASK_INTERRUPTIBLE);
+		schedule_timeout(HZ);
 		if (signal_pending(current))
 			goto done;
 		if (msp->restart) {
@@ -992,16 +991,16 @@
 }
 
 static /*const*/ struct file_operations msp3400c_mixer_fops = {
-        &msp3400c_mixer_llseek,
+        msp3400c_mixer_llseek,
         NULL,  /* read */
         NULL,  /* write */
         NULL,  /* readdir */
         NULL,  /* poll */
-        &msp3400c_mixer_ioctl,
+        msp3400c_mixer_ioctl,
         NULL,  /* mmap */
-        &msp3400c_mixer_open,
+        msp3400c_mixer_open,
 	NULL,
-        &msp3400c_mixer_release,
+        msp3400c_mixer_release,
         NULL,  /* fsync */
         NULL,  /* fasync */
         NULL,  /* check_media_change */