summaryrefslogtreecommitdiffstats
path: root/drivers/media/pci
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@osg.samsung.com>2016-02-05 14:14:05 +0100
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2016-02-10 10:23:42 +0100
commit568b2febeeb139879efe93756aa58e2e42559f90 (patch)
tree8594d1306c3217bfce6a5a83ad195f22b0376423 /drivers/media/pci
parent[media] saa7134: use input types, instead of hardcoding strings (diff)
downloadlinux-568b2febeeb139879efe93756aa58e2e42559f90.tar.xz
linux-568b2febeeb139879efe93756aa58e2e42559f90.zip
[media] saa7134: unconditionlally update TV standard at demod
It doesn't make any sense to only update the TV standard for TV, as composite and S-Video inputs also need it. Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/pci')
-rw-r--r--drivers/media/pci/saa7134/saa7134-video.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/pci/saa7134/saa7134-video.c b/drivers/media/pci/saa7134/saa7134-video.c
index ae52ef019e43..59781755247a 100644
--- a/drivers/media/pci/saa7134/saa7134-video.c
+++ b/drivers/media/pci/saa7134/saa7134-video.c
@@ -479,8 +479,7 @@ void saa7134_set_tvnorm_hw(struct saa7134_dev *dev)
{
saa7134_set_decoder(dev);
- if (card_in(dev, dev->ctl_input).tv)
- saa_call_all(dev, video, s_std, dev->tvnorm->id);
+ saa_call_all(dev, video, s_std, dev->tvnorm->id);
/* Set the correct norm for the saa6752hs. This function
does nothing if there is no saa6752hs. */
saa_call_empress(dev, video, s_std, dev->tvnorm->id);