diff options
| author | Michael Krufky <mkrufky@linuxtv.org> | 2012-03-18 14:35:57 -0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-02 09:53:02 -0700 |
| commit | 25c67995203d092a3ab6860ddb84050cab745efe (patch) | |
| tree | a659a6aaa2d6017dd0baa97f79616f5874d53b81 | |
| parent | 58f3dcce144cf88dedeb89250545ae242532b3c9 (diff) | |
| download | kernel_samsung_smdk4412-25c67995203d092a3ab6860ddb84050cab745efe.zip kernel_samsung_smdk4412-25c67995203d092a3ab6860ddb84050cab745efe.tar.gz kernel_samsung_smdk4412-25c67995203d092a3ab6860ddb84050cab745efe.tar.bz2 | |
mxl111sf: fix error on stream stop in mxl111sf_ep6_streaming_ctrl()
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>
| -rw-r--r-- | drivers/media/dvb/dvb-usb/mxl111sf.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/media/dvb/dvb-usb/mxl111sf.c b/drivers/media/dvb/dvb-usb/mxl111sf.c index b5c98da..bc6ea9f 100644 --- 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(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; } |