X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=drivers%2Fmedia%2Fvideo%2Fem28xx%2Fem28xx-cards.c;h=50ccf377120488e0d61a40776b4e2a162b529915;hb=ef69c8e88bafdeb896395fa5379a4b8c6a10bb08;hp=13ffde2810671850d8944c22890aebec10636915;hpb=c67ec53f8f4e90ebd482789e2f6d121f41a0bd90;p=mirror_ubuntu-zesty-kernel.git

diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index 13ffde281067..50ccf3771204 100644
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -435,14 +435,14 @@ MODULE_DEVICE_TABLE(usb, em28xx_id_table);
  */
 
 /* Board Hauppauge WinTV HVR 900 analog */
-struct em28xx_reg_seq hauppauge_wintv_hvr_900_analog[] = {
+static struct em28xx_reg_seq hauppauge_wintv_hvr_900_analog[] = {
 	{EM28XX_R08_GPIO,	0x2d,	~EM_GPIO_4,	10},
 	{0x05,			0xff,	0x10,		10},
 	{  -1,			-1,	-1,		-1},
 };
 
 /* Board Hauppauge WinTV HVR 900 digital */
-struct em28xx_reg_seq hauppauge_wintv_hvr_900_digital[] = {
+static struct em28xx_reg_seq hauppauge_wintv_hvr_900_digital[] = {
 	{EM28XX_R08_GPIO,	0x2e,	~EM_GPIO_4,	10},
 	{EM2880_R04_GPO,	0x04,	0x0f,		10},
 	{EM2880_R04_GPO,	0x0c,	0x0f,		10},
@@ -450,7 +450,7 @@ struct em28xx_reg_seq hauppauge_wintv_hvr_900_digital[] = {
 };
 
 /* Board Hauppauge WinTV HVR 900 tuner_callback */
-struct em28xx_reg_seq hauppauge_wintv_hvr_900_tuner_callback[] = {
+static struct em28xx_reg_seq hauppauge_wintv_hvr_900_tuner_callback[] = {
 	{EM28XX_R08_GPIO,	EM_GPIO_4,	EM_GPIO_4,	10},
 	{EM28XX_R08_GPIO,	0,		EM_GPIO_4,	10},
 	{EM28XX_R08_GPIO,	EM_GPIO_4,	EM_GPIO_4,	10},
@@ -554,7 +554,7 @@ void em28xx_pre_card_setup(struct em28xx *dev)
 	em28xx_set_mode(dev, EM28XX_MODE_UNDEFINED);
 }
 
-void em28xx_setup_xc3028(struct em28xx *dev, struct xc2028_ctrl *ctl)
+static void em28xx_setup_xc3028(struct em28xx *dev, struct xc2028_ctrl *ctl)
 {
 	memset(ctl, 0, sizeof(*ctl));
 
@@ -563,15 +563,17 @@ void em28xx_setup_xc3028(struct em28xx *dev, struct xc2028_ctrl *ctl)
 	ctl->mts = em28xx_boards[dev->model].mts_firmware;
 
 	switch (dev->model) {
-	/* Add card-specific parameters for xc3028 here */
+	case EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900:
+		ctl->demod = XC3028_FE_ZARLINK456;
+		break;
 	case EM2880_BOARD_HAUPPAUGE_WINTV_HVR_950:
+		/* FIXME: Better to specify the needed IF */
 		ctl->demod = XC3028_FE_DEFAULT;
 		break;
 	default:
 		ctl->demod = XC3028_FE_OREN538;
 	}
 }
-EXPORT_SYMBOL_GPL(em28xx_setup_xc3028);
 
 static void em28xx_config_tuner(struct em28xx *dev)
 {