[ 125/175] [media] mxl111sf: fix error on stream stop in mxl111sf_ep6_streaming_ctrl()
From: Greg KH <gregkh@linuxfoundation.org>
Date: 2012-03-30 21:23:17
Also in:
lkml
From: Greg KH <gregkh@linuxfoundation.org>
Date: 2012-03-30 21:23:17
Also in:
lkml
3.3-stable review patch. If anyone has any objections, please let me know. ------------------ From: Michael Krufky <mkrufky@linuxtv.org> 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 <redacted> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- drivers/media/dvb/dvb-usb/mxl111sf.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
--- a/drivers/media/dvb/dvb-usb/mxl111sf.c
+++ b/drivers/media/dvb/dvb-usb/mxl111sf.c@@ -351,15 +351,13 @@ static int mxl111sf_ep6_streaming_ctrl(s 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; }