Merge branch 'for-linus' of git://git.infradead.org/users/eparis/notify

[pandora-kernel.git] / drivers / media / video / em28xx / em28xx-cards.c

diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index ba20065..320f1f6 100644 (file)
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -159,7 +159,7 @@ static struct em28xx_reg_seq evga_indtube_digital[] = {
 
 /* Pinnacle Hybrid Pro eb1a:2881 */
 static struct em28xx_reg_seq pinnacle_hybrid_pro_analog[] = {
-       {EM28XX_R08_GPIO,       0x6f,   ~EM_GPIO_4,     10},
+       {EM28XX_R08_GPIO,       0xfd,   ~EM_GPIO_4,     10},
        {       -1,             -1,     -1,             -1},
 };
 
@@ -1990,6 +1990,7 @@ static void em28xx_setup_xc3028(struct em28xx *dev, struct xc2028_ctrl *ctl)
                ctl->demod = XC3028_FE_ZARLINK456;
                break;
        case EM2880_BOARD_TERRATEC_HYBRID_XS:
+       case EM2881_BOARD_PINNACLE_HYBRID_PRO:
                ctl->demod = XC3028_FE_ZARLINK456;
                break;
        case EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900_R2:
@@ -2286,6 +2287,7 @@ void em28xx_card_setup(struct em28xx *dev)
                   em28xx_set_mode() in em28xx_pre_card_setup() was a no-op,
                   so make the call now so the analog GPIOs are set properly
                   before probing the i2c bus. */
+               em28xx_gpio_set(dev, dev->board.tuner_gpio);
                em28xx_set_mode(dev, EM28XX_ANALOG_MODE);
                break;
        case EM2820_BOARD_SILVERCREST_WEBCAM: