diff options
Diffstat (limited to 'linux/drivers/media/video')
-rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-video.c | 4 | ||||
-rw-r--r-- | linux/drivers/media/video/tda9887.c | 4 | ||||
-rw-r--r-- | linux/drivers/media/video/tuner-core.c | 12 |
3 files changed, 10 insertions, 10 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-video.c b/linux/drivers/media/video/saa7134/saa7134-video.c index 60cffee2e..326aff23e 100644 --- a/linux/drivers/media/video/saa7134/saa7134-video.c +++ b/linux/drivers/media/video/saa7134/saa7134-video.c @@ -1,5 +1,5 @@ /* - * $Id: saa7134-video.c,v 1.38 2005/08/17 19:42:11 nsh Exp $ + * $Id: saa7134-video.c,v 1.39 2005/08/18 02:06:25 mkrufky Exp $ * * device driver for philips saa7134 based TV cards * video4linux video interface @@ -1368,7 +1368,7 @@ static int video_release(struct inode *inode, struct file *file) saa_andorb(SAA7134_OFMT_VIDEO_B, 0x1f, 0); saa_andorb(SAA7134_OFMT_DATA_A, 0x1f, 0); saa_andorb(SAA7134_OFMT_DATA_B, 0x1f, 0); - + saa7134_i2c_call_clients(dev, TUNER_SET_STANDBY, NULL); /* free stuff */ diff --git a/linux/drivers/media/video/tda9887.c b/linux/drivers/media/video/tda9887.c index dd791ef8a..30859372d 100644 --- a/linux/drivers/media/video/tda9887.c +++ b/linux/drivers/media/video/tda9887.c @@ -580,7 +580,7 @@ static int tda9887_configure(struct tda9887 *t) } tda9887_set_config(t,buf); tda9887_set_insmod(t,buf); - + if (t->mode == T_STANDBY) { buf[1] |= cForcedMuteAudioON; } @@ -695,7 +695,7 @@ tda9887_command(struct i2c_client *client, unsigned int cmd, void *arg) break; } case TUNER_SET_STANDBY: - { + { t->mode = T_STANDBY; tda9887_configure(t); break; diff --git a/linux/drivers/media/video/tuner-core.c b/linux/drivers/media/video/tuner-core.c index 314229b0f..1024086b6 100644 --- a/linux/drivers/media/video/tuner-core.c +++ b/linux/drivers/media/video/tuner-core.c @@ -1,5 +1,5 @@ /* - * $Id: tuner-core.c,v 1.67 2005/08/17 19:42:11 nsh Exp $ + * $Id: tuner-core.c,v 1.68 2005/08/18 02:06:25 mkrufky Exp $ * * i2c tv tuner chip device driver * core core, i.e. kernel interfaces, registering and so on @@ -226,7 +226,7 @@ static void set_addr(struct i2c_client *c, struct tuner_setup *tun_setup) { struct tuner *t = i2c_get_clientdata(c); - if ((tun_setup->addr == ADDR_UNSET && + if ((tun_setup->addr == ADDR_UNSET && (t->mode_mask & tun_setup->mode_mask)) || tun_setup->addr == c->addr) { set_type(c, tun_setup->type, tun_setup->mode_mask); @@ -238,7 +238,7 @@ static inline int check_mode(struct tuner *t, char *cmd) if ((1 << t->mode & t->mode_mask) == 0) { return EINVAL; } - + switch (t->mode) { case V4L2_TUNER_RADIO: tuner_dbg("Cmd %s accepted for radio\n", cmd); @@ -424,11 +424,11 @@ static int tuner_detach(struct i2c_client *client) static inline int set_mode(struct i2c_client *client, struct tuner *t, int mode, char *cmd) { - if (mode == t->mode) + if (mode == t->mode) return 0; - + t->mode = mode; - + if (check_mode(t, cmd) == EINVAL) { t->mode = T_STANDBY; if (t->standby) |