V4L/DVB (9763): em28xx: fix gpio settings

A previous changeset moved gpio from em28xx struct into em28xx_board.
However, the driver were not updated to properly honor those gpio's.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/video/em28xx/em28xx-core.c b/drivers/media/video/em28xx/em28xx-core.c
index e777ca636ecb6fcde2c6d0d57709edd38424c719..71a1aaaa982ec695da0afc628767a1136fa92718 100644 (file)
--- a/drivers/media/video/em28xx/em28xx-core.c
+++ b/drivers/media/video/em28xx/em28xx-core.c
@@ -775,9 +775,9 @@ int em28xx_set_mode(struct em28xx *dev, enum em28xx_mode set_mode)
        dev->mode = set_mode;
 
        if (dev->mode == EM28XX_DIGITAL_MODE)
-               return em28xx_gpio_set(dev, dev->digital_gpio);
+               return em28xx_gpio_set(dev, dev->board.dvb_gpio);
        else
-               return em28xx_gpio_set(dev, dev->analog_gpio);
+               return em28xx_gpio_set(dev, INPUT(dev->ctl_input)->gpio);
 }
 EXPORT_SYMBOL_GPL(em28xx_set_mode);
 

diff --git a/drivers/media/video/em28xx/em28xx.h b/drivers/media/video/em28xx/em28xx.h
index fdc225c617ef8d0294bc1b451d52046bfc05a8e7..b2b41b3635e23ada03564c2f0d0d1258126c79ba 100644 (file)
--- a/drivers/media/video/em28xx/em28xx.h
+++ b/drivers/media/video/em28xx/em28xx.h
@@ -431,9 +431,6 @@ struct em28xx {
        /* Some older em28xx chips needs a waiting time after writing */
        unsigned int wait_after_write;
 
-       /* GPIO sequences for analog and digital mode */
-       struct em28xx_reg_seq *analog_gpio, *digital_gpio;
-
        /* GPIO sequences for tuner callbacks */
        struct em28xx_reg_seq *tuner_gpio;