]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
mxl111sf: fix error on stream stop in mxl111sf_ep6_streaming_ctrl()
authorMichael Krufky <mkrufky@linuxtv.org>
Sun, 18 Mar 2012 17:35:57 +0000 (14:35 -0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 2 Apr 2012 16:53:02 +0000 (09:53 -0700)
commit 3be5bb71fbf18f83cb88b54a62a78e03e5a4f30a upstream.

Remove unnecessary register access in mxl111sf_ep6_streaming_ctrl()

This code breaks driver operation in kernel 3.3 and later, although
it works properly in 3.2  Disable register access to 0x12 for now.

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/media/dvb/dvb-usb/mxl111sf.c

index b5c98da5d9e29263fcb5ce42141a3d4e9e6cc693..bc6ea9fadb18fafa743e10ec62311dd5e7b6be1e 100644 (file)
@@ -351,15 +351,13 @@ static int mxl111sf_ep6_streaming_ctrl(struct dvb_usb_adapter *adap, int onoff)
                                              adap_state->ep6_clockphase,
                                              0, 0);
                mxl_fail(ret);
+#if 0
        } else {
                ret = mxl111sf_disable_656_port(state);
                mxl_fail(ret);
+#endif
        }
 
-       mxl111sf_read_reg(state, 0x12, &tmp);
-       tmp &= ~0x04;
-       mxl111sf_write_reg(state, 0x12, tmp);
-
        return ret;
 }