From cfef9bff24fb7af59ab2f4dc73a31a817eb01409 Mon Sep 17 00:00:00 2001 From: Michael Krufky Date: Tue, 4 Dec 2012 12:46:38 -0300 Subject: [PATCH] --- yaml --- r: 356994 b: refs/heads/master c: 5b7d8de7d2328f7b25fe4645eafee7e48f9b7df3 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/usb/au0828/au0828-cards.c | 16 +++++++++++----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 88b963aa8b34..df14f8ce4382 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8a4e786660f512b029b56d94d1b8f0201e67aab3 +refs/heads/master: 5b7d8de7d2328f7b25fe4645eafee7e48f9b7df3 diff --git a/trunk/drivers/media/usb/au0828/au0828-cards.c b/trunk/drivers/media/usb/au0828/au0828-cards.c index 7b5b7420066d..88e35dfa33d4 100644 --- a/trunk/drivers/media/usb/au0828/au0828-cards.c +++ b/trunk/drivers/media/usb/au0828/au0828-cards.c @@ -185,14 +185,11 @@ static void hauppauge_eeprom(struct au0828_dev *dev, u8 *eeprom_data) __func__, tv.model); } +void au0828_card_analog_fe_setup(struct au0828_dev *dev); + void au0828_card_setup(struct au0828_dev *dev) { static u8 eeprom[256]; -#ifdef CONFIG_VIDEO_AU0828_V4L2 - struct tuner_setup tun_setup; - struct v4l2_subdev *sd; - unsigned int mode_mask = T_ANALOG_TV; -#endif dprintk(1, "%s()\n", __func__); @@ -213,7 +210,16 @@ void au0828_card_setup(struct au0828_dev *dev) break; } + au0828_card_analog_fe_setup(dev); +} + +void au0828_card_analog_fe_setup(struct au0828_dev *dev) +{ #ifdef CONFIG_VIDEO_AU0828_V4L2 + struct tuner_setup tun_setup; + struct v4l2_subdev *sd; + unsigned int mode_mask = T_ANALOG_TV; + if (AUVI_INPUT(0).type != AU0828_VMUX_UNDEFINED) { /* Load the analog demodulator driver (note this would need to be abstracted out if we ever need to support a different