diff options
author | Alex Shi <alex.shi@linaro.org> | 2017-01-13 12:01:52 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2017-01-13 12:01:52 +0800 |
commit | e30546378ec2c5cc1a5ef97695d8ba859b0abd23 (patch) | |
tree | 0a3c9d9ac448694a039a63db6549cfaebdaea07f /drivers/media | |
parent | 7785301d9209cf083369c6f088cd1d48ec417863 (diff) | |
parent | 99d4c5fe0b7838de15c59b375491ef075848d92d (diff) |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/pci/cx23885/cx23885-dvb.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/media/pci/cx23885/cx23885-dvb.c b/drivers/media/pci/cx23885/cx23885-dvb.c index c4307ad8594c..e543cbbf2ec4 100644 --- a/drivers/media/pci/cx23885/cx23885-dvb.c +++ b/drivers/media/pci/cx23885/cx23885-dvb.c @@ -2168,11 +2168,12 @@ static int dvb_register(struct cx23885_tsport *port) } port->i2c_client_tuner = client_tuner; break; - case CX23885_BOARD_HAUPPAUGE_HVR5525: - switch (port->nr) { + case CX23885_BOARD_HAUPPAUGE_HVR5525: { struct m88rs6000t_config m88rs6000t_config; struct a8293_platform_data a8293_pdata = {}; + switch (port->nr) { + /* port b - satellite */ case 1: /* attach frontend */ @@ -2267,6 +2268,7 @@ static int dvb_register(struct cx23885_tsport *port) break; } break; + } default: printk(KERN_INFO "%s: The frontend of your DVB/ATSC card " " isn't supported yet\n", |