From: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Date: Wed, 9 Nov 2005 05:37:47 +0000 (-0800)
Subject: [PATCH] v4l: 803: after msp34xxg reset msp wake thread should be called
X-Git-Tag: v2.6.15-rc1~209
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4c0772a9e1fdd5972751993c58d0ac2a427ceb24;p=linux-2.6

[PATCH] v4l: 803: after msp34xxg reset msp wake thread should be called

- After msp34xxg_reset, msp_wake_thread should be called to
	wake again.

Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/drivers/media/video/msp3400.c b/drivers/media/video/msp3400.c
index 699cea2cc6..ba2c95842f 100644
--- a/drivers/media/video/msp3400.c
+++ b/drivers/media/video/msp3400.c
@@ -1788,10 +1788,9 @@ 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)) {
+		if (IS_MSP34XX_G(msp))
 			msp34xxg_reset(client);
-			break;
-		}
+
 		msp->watch_stereo = 0;
 		switch (msp->opmode) {
 		case OPMODE_MANUAL:
@@ -1906,10 +1905,9 @@ 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)) {
+		if (IS_MSP34XX_G(msp))
 			msp34xxg_reset(client);
-			break;
-		}
+
 		msp_wake_thread(client);
 		break;
 	}
@@ -1919,10 +1917,9 @@ 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)) {
+		if (IS_MSP34XX_G(msp))
 			msp34xxg_reset(client);
-			break;
-		}
+
 		msp_wake_thread(client);
 		break;
 	}