aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/usb
diff options
context:
space:
mode:
authorBrad Love <brad@nextdimension.cc>2018-05-02 17:46:18 -0400
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>2018-05-09 16:25:40 -0400
commit01affb000e00cfa0a9e9954476ef50962eb8b168 (patch)
treed4611d6262159b279a081d0976a3af7f179f3b62 /drivers/media/usb
parentmedia: videobuf-dma-sg: Fix dma_{sync,unmap}_sg() calls (diff)
downloadlinux-dev-01affb000e00cfa0a9e9954476ef50962eb8b168.tar.xz
linux-dev-01affb000e00cfa0a9e9954476ef50962eb8b168.zip
media: em28xx: Fix DualHD broken second tuner
The use of a hard coded i2c address breaks the creation of the second tuner in DualHD 01595 models. The issue is compounded by lack of any error message stating that a driver failed initialization. Use addr, which contains the correct address for each tuner. Fixes: ad32495b1513 ("media: em28xx-dvb: simplify DVB module probing logic") Signed-off-by: Brad Love <brad@nextdimension.cc> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Diffstat (limited to 'drivers/media/usb')
-rw-r--r--drivers/media/usb/em28xx/em28xx-dvb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/usb/em28xx/em28xx-dvb.c b/drivers/media/usb/em28xx/em28xx-dvb.c
index b330d40b5c21..cb85639036f6 100644
--- a/drivers/media/usb/em28xx/em28xx-dvb.c
+++ b/drivers/media/usb/em28xx/em28xx-dvb.c
@@ -1393,7 +1393,7 @@ static int em28174_dvb_init_hauppauge_wintv_dualhd_01595(struct em28xx *dev)
dvb->i2c_client_tuner = dvb_module_probe("si2157", NULL,
adapter,
- 0x60, &si2157_config);
+ addr, &si2157_config);
if (!dvb->i2c_client_tuner) {
dvb_module_release(dvb->i2c_client_demod);
return -ENODEV;