summary refs log tree commit diff
diff options
context:
space:
mode:
authorBrad Love <brad@nextdimension.cc>2018-05-03 17:20:10 -0400
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>2018-05-05 08:55:29 -0400
commit13a257f8d5a530bd2aa004a067ba1f2b8f5ef76d (patch)
treee2168dccae7ed491e0a4d43d0197c61d5bd36b1d
parent2fb579bb10391f62e9ebebddc356a9c9020fb621 (diff)
downloadlinux-13a257f8d5a530bd2aa004a067ba1f2b8f5ef76d.tar.gz
media: cx231xx: Ignore an i2c mux adapter
Hauppauge 935C cannot communicate with the si2157
when using the mux adapter returned by the si2168,
so disable it to fix the device.

Signed-off-by: Brad Love <brad@nextdimension.cc>
Cc: stable@vger.kernel.org
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
-rw-r--r--drivers/media/usb/cx231xx/cx231xx-dvb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/usb/cx231xx/cx231xx-dvb.c b/drivers/media/usb/cx231xx/cx231xx-dvb.c
index 18be20ba8309..86c33f5ff1a3 100644
--- a/drivers/media/usb/cx231xx/cx231xx-dvb.c
+++ b/drivers/media/usb/cx231xx/cx231xx-dvb.c
@@ -1150,7 +1150,7 @@ static int dvb_init(struct cx231xx *dev)
 		info.platform_data = &si2157_config;
 		request_module("si2157");
 
-		client = i2c_new_device(adapter, &info);
+		client = i2c_new_device(tuner_i2c, &info);
 		if (client == NULL || client->dev.driver == NULL) {
 			module_put(dvb->i2c_client_demod[0]->dev.driver->owner);
 			i2c_unregister_device(dvb->i2c_client_demod[0]);