summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/msp3400.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@brturbo.com.br>2005-11-08 21:37:47 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-09 07:56:21 -0800
commit4c0772a9e1fdd5972751993c58d0ac2a427ceb24 (patch)
tree9c160799fed372fe1148c4378054cdd4d02141d0 /drivers/media/video/msp3400.c
parent02f7427333c5784a937314a305132ed31cc6b9d1 (diff)
downloadblackbird-op-linux-4c0772a9e1fdd5972751993c58d0ac2a427ceb24.tar.gz
blackbird-op-linux-4c0772a9e1fdd5972751993c58d0ac2a427ceb24.zip
[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>
Diffstat (limited to 'drivers/media/video/msp3400.c')
-rw-r--r--drivers/media/video/msp3400.c15
1 files changed, 6 insertions, 9 deletions
diff --git a/drivers/media/video/msp3400.c b/drivers/media/video/msp3400.c
index 699cea2cc648..ba2c95842fba 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;
}
OpenPOWER on IntegriCloud