diff options
Diffstat (limited to 'drivers/media/video/saa7134/saa7134-tvaudio.c')
-rw-r--r-- | drivers/media/video/saa7134/saa7134-tvaudio.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/media/video/saa7134/saa7134-tvaudio.c b/drivers/media/video/saa7134/saa7134-tvaudio.c index fdca6c563b96..3daf1b597958 100644 --- a/drivers/media/video/saa7134/saa7134-tvaudio.c +++ b/drivers/media/video/saa7134/saa7134-tvaudio.c | |||
@@ -246,7 +246,7 @@ static void mute_input_7134(struct saa7134_dev *dev) | |||
246 | if (PCI_DEVICE_ID_PHILIPS_SAA7134 == dev->pci->device) | 246 | if (PCI_DEVICE_ID_PHILIPS_SAA7134 == dev->pci->device) |
247 | /* 7134 mute */ | 247 | /* 7134 mute */ |
248 | saa_writeb(SAA7134_AUDIO_MUTE_CTRL, mute ? | 248 | saa_writeb(SAA7134_AUDIO_MUTE_CTRL, mute ? |
249 | SAA7134_MUTE_MASK | | 249 | SAA7134_MUTE_MASK | |
250 | SAA7134_MUTE_ANALOG | | 250 | SAA7134_MUTE_ANALOG | |
251 | SAA7134_MUTE_I2S : | 251 | SAA7134_MUTE_I2S : |
252 | SAA7134_MUTE_MASK); | 252 | SAA7134_MUTE_MASK); |
@@ -761,17 +761,17 @@ static int mute_input_7133(struct saa7134_dev *dev) | |||
761 | 761 | ||
762 | 762 | ||
763 | /* switch gpio-connected external audio mux */ | 763 | /* switch gpio-connected external audio mux */ |
764 | if (0 != card(dev).gpiomask) { | 764 | if (0 != card(dev).gpiomask) { |
765 | mask = card(dev).gpiomask; | 765 | mask = card(dev).gpiomask; |
766 | 766 | ||
767 | if (card(dev).mute.name && dev->ctl_mute) | 767 | if (card(dev).mute.name && dev->ctl_mute) |
768 | in = &card(dev).mute; | 768 | in = &card(dev).mute; |
769 | else | 769 | else |
770 | in = dev->input; | 770 | in = dev->input; |
771 | 771 | ||
772 | saa_andorl(SAA7134_GPIO_GPMODE0 >> 2, mask, mask); | 772 | saa_andorl(SAA7134_GPIO_GPMODE0 >> 2, mask, mask); |
773 | saa_andorl(SAA7134_GPIO_GPSTATUS0 >> 2, mask, in->gpio); | 773 | saa_andorl(SAA7134_GPIO_GPSTATUS0 >> 2, mask, in->gpio); |
774 | saa7134_track_gpio(dev,in->name); | 774 | saa7134_track_gpio(dev,in->name); |
775 | } | 775 | } |
776 | 776 | ||
777 | return 0; | 777 | return 0; |