4.17-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Brad Love <b...@nextdimension.cc>

commit 13a257f8d5a530bd2aa004a067ba1f2b8f5ef76d upstream.

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 <b...@nextdimension.cc>
Cc: sta...@vger.kernel.org
Signed-off-by: Mauro Carvalho Chehab <mchehab+sams...@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>

---
 drivers/media/usb/cx231xx/cx231xx-dvb.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/drivers/media/usb/cx231xx/cx231xx-dvb.c
+++ b/drivers/media/usb/cx231xx/cx231xx-dvb.c
@@ -1151,7 +1151,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]);


Reply via email to