projects / GitHub / exynos8895 / android_kernel_samsung_universal8895.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e4de03f)
[media] cx231xx: remove direct register PWR_CTL_EN modification that switches port3
authorMatthias Schwarzott <zzam@gentoo.org>
Thu, 30 Oct 2014 22:43:55 +0000 (19:43 -0300)
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>
Sat, 1 Nov 2014 10:59:06 +0000 (08:59 -0200)
The only remaining place that modifies the relevant bit is in function
cx231xx_set_Colibri_For_LowIF

Signed-off-by: Matthias Schwarzott <zzam@gentoo.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
drivers/media/usb/cx231xx/cx231xx-avcore.c patch | blob | blame | history

diff --git a/drivers/media/usb/cx231xx/cx231xx-avcore.c b/drivers/media/usb/cx231xx/cx231xx-avcore.c
index b56bc87790741f70ed56eed406bcf255d2f802f8..781908b5a1a3187439bfa606332ba6f7cc025435 100644 (file)
--- a/drivers/media/usb/cx231xx/cx231xx-avcore.c
+++ b/drivers/media/usb/cx231xx/cx231xx-avcore.c
@@ -2270,7 +2270,6 @@ int cx231xx_set_power_mode(struct cx231xx *dev, enum AV_MODE mode)
        case POLARIS_AVMODE_ANALOGT_TV:
 
                tmp |= PWR_DEMOD_EN;
-               tmp |= (I2C_DEMOD_EN);
                value[0] = (u8) tmp;
                value[1] = (u8) (tmp >> 8);
                value[2] = (u8) (tmp >> 16);
@@ -2366,7 +2365,7 @@ int cx231xx_set_power_mode(struct cx231xx *dev, enum AV_MODE mode)
                }
 
                tmp &= (~PWR_AV_MODE);
-               tmp |= POLARIS_AVMODE_DIGITAL | I2C_DEMOD_EN;
+               tmp |= POLARIS_AVMODE_DIGITAL;
                value[0] = (u8) tmp;
                value[1] = (u8) (tmp >> 8);
                value[2] = (u8) (tmp >> 16);