patch-2.3.99-pre7 linux/drivers/char/msp3400.c

• Lines: 67
• Date: Fri May 5 12:37:52 2000
• Orig file: v2.3.99-pre6/linux/drivers/char/msp3400.c
• Orig date: Wed Apr 26 16:34:07 2000

diff -u --recursive --new-file v2.3.99-pre6/linux/drivers/char/msp3400.c linux/drivers/char/msp3400.c
@@ -663,11 +663,8 @@
 	}
 	if (once)
 		msp->watch_stereo = 0;
-	if (msp->watch_stereo) {
-		del_timer(&msp->wake_stereo);
-		msp->wake_stereo.expires = jiffies + 5*HZ;
-		add_timer(&msp->wake_stereo);
-	}
+	if (msp->watch_stereo)
+		mod_timer(&msp->wake_stereo, jiffies+5*HZ);
 }
 
 static int msp3400c_thread(void *data)
@@ -874,11 +871,8 @@
 		/* unmute */
 		msp3400c_setvolume(client, msp->left, msp->right);
 
-		if (msp->watch_stereo) {
-			del_timer(&msp->wake_stereo);
-			msp->wake_stereo.expires = jiffies + 5*HZ;
-			add_timer(&msp->wake_stereo);
-		}
+		if (msp->watch_stereo) 
+			mod_timer(&msp->wake_stereo, jiffies+5*HZ);
 
 		if (debug)
 			msp3400c_print_mode(msp);
@@ -1092,11 +1086,8 @@
 		msp3400c_settreble(client, msp->treble);
 		msp3400c_setvolume(client, msp->left, msp->right);
 
-		if (msp->watch_stereo) {
-			del_timer(&msp->wake_stereo);
-			msp->wake_stereo.expires = jiffies + HZ;
-			add_timer(&msp->wake_stereo);
-		}
+		if (msp->watch_stereo) 
+			mod_timer(&msp->wake_stereo, jiffies+HZ);
 
 		msp->active = 0;
 	}
@@ -1245,7 +1236,7 @@
 msp3400c_mixer_open(struct inode *inode, struct file *file)
 {
         int minor = MINOR(inode->i_rdev);
-	struct i2c_client *client;
+	struct i2c_client *client = NULL;
 	struct msp3400c *msp;
 	int i;
 
@@ -1255,12 +1246,12 @@
 		if (msp->mixer_num == minor) {
 			client = msps[i];
 			file->private_data = client;
-			break;
+			goto match;
 		}
 	}
-	if (MSP3400_MAX == i)
-		return -ENODEV;
+	return -ENODEV;
 
+match:
 	/* lock bttv in memory while the mixer is in use  */
 	if (client->adapter->inc_use)
 		client->adapter->inc_use(client->adapter);