---

yaml --- r: 13360 b: refs/heads/master c: 78f8240 h: refs/heads/master v: v3
git-mirror · Nov 9, 2005 · cac403e · cac403e
1 parent d66d3fc
commit cac403e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 74458e6c1aea9e422e46030e7bc61e9b0984be5b
+refs/heads/master: 78f82405ace9415e72a87b16c195675f053381f1
diff --git a/trunk/drivers/media/video/msp3400.c b/trunk/drivers/media/video/msp3400.c
@@ -1788,6 +1788,10 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg)
 		dprintk("msp34xx: AUDC_SET_RADIO\n");
 		msp->norm = VIDEO_MODE_RADIO;
 		dprintk("msp34xx: switching to radio mode\n");
+		if (IS_MSP34XX_G(msp)) {
+			msp34xxg_reset(client);
+			break;
+		}
 		msp->watch_stereo = 0;
 		switch (msp->opmode) {
 		case OPMODE_MANUAL:
@@ -1902,6 +1906,10 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg)
 
 		dprintk("msp34xx: VIDIOCSCHAN (norm=%d)\n",vc->norm);
 		msp->norm = vc->norm;
+		if (IS_MSP34XX_G(msp)) {
+			msp34xxg_reset(client);
+			break;
+		}
 		msp_wake_thread(client);
 		break;
 	}
@@ -1911,6 +1919,10 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg)
 	{
 		/* new channel -- kick audio carrier scan */
 		dprintk("msp34xx: VIDIOCSFREQ\n");
+		if (IS_MSP34XX_G(msp)) {
+			msp34xxg_reset(client);
+			break;
+		}
 		msp_wake_thread(client);
 		break;
 	}