diff options
Diffstat (limited to 'drivers/media/video/saa7134/saa7134-video.c')
-rw-r--r-- | drivers/media/video/saa7134/saa7134-video.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/saa7134/saa7134-video.c b/drivers/media/video/saa7134/saa7134-video.c index 404f70eeb355..493cad941460 100644 --- a/drivers/media/video/saa7134/saa7134-video.c +++ b/drivers/media/video/saa7134/saa7134-video.c | |||
@@ -625,10 +625,10 @@ void saa7134_set_tvnorm_hw(struct saa7134_dev *dev) | |||
625 | saa7134_set_decoder(dev); | 625 | saa7134_set_decoder(dev); |
626 | 626 | ||
627 | if (card_in(dev, dev->ctl_input).tv) | 627 | if (card_in(dev, dev->ctl_input).tv) |
628 | saa_call_all(dev, tuner, s_std, dev->tvnorm->id); | 628 | saa_call_all(dev, core, s_std, dev->tvnorm->id); |
629 | /* Set the correct norm for the saa6752hs. This function | 629 | /* Set the correct norm for the saa6752hs. This function |
630 | does nothing if there is no saa6752hs. */ | 630 | does nothing if there is no saa6752hs. */ |
631 | saa_call_empress(dev, tuner, s_std, dev->tvnorm->id); | 631 | saa_call_empress(dev, core, s_std, dev->tvnorm->id); |
632 | } | 632 | } |
633 | 633 | ||
634 | static void set_h_prescale(struct saa7134_dev *dev, int task, int prescale) | 634 | static void set_h_prescale(struct saa7134_dev *dev, int task, int prescale) |
@@ -1496,7 +1496,7 @@ static int video_release(struct file *file) | |||
1496 | saa_andorb(SAA7134_OFMT_DATA_A, 0x1f, 0); | 1496 | saa_andorb(SAA7134_OFMT_DATA_A, 0x1f, 0); |
1497 | saa_andorb(SAA7134_OFMT_DATA_B, 0x1f, 0); | 1497 | saa_andorb(SAA7134_OFMT_DATA_B, 0x1f, 0); |
1498 | 1498 | ||
1499 | saa_call_all(dev, core, s_standby, 0); | 1499 | saa_call_all(dev, tuner, s_standby); |
1500 | if (fh->radio) | 1500 | if (fh->radio) |
1501 | saa_call_all(dev, core, ioctl, RDS_CMD_CLOSE, &cmd); | 1501 | saa_call_all(dev, core, ioctl, RDS_CMD_CLOSE, &cmd); |
1502 | 1502 | ||