Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 13374
b: refs/heads/master
c: 4c0772a
h: refs/heads/master
v: v3
  • Loading branch information
Mauro Carvalho Chehab authored and Linus Torvalds committed Nov 9, 2005
1 parent 29da662 commit 4bfe1aa
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 10 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 02f7427333c5784a937314a305132ed31cc6b9d1
refs/heads/master: 4c0772a9e1fdd5972751993c58d0ac2a427ceb24
15 changes: 6 additions & 9 deletions trunk/drivers/media/video/msp3400.c
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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;
}
Expand All @@ -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;
}
Expand Down

0 comments on commit 4bfe1aa

Please sign in to comment.