diff options
author | Michael Krufky <mkrufky@linuxtv.org> | 2012-03-18 13:35:57 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-03-19 21:24:40 -0400 |
commit | 3be5bb71fbf18f83cb88b54a62a78e03e5a4f30a (patch) | |
tree | 9e5f86660b0bd9462a3e242fa52b8b944b64f623 /drivers/media | |
parent | 3553085cb47b10762e77ca783683dbf8142f9762 (diff) |
[media] mxl111sf: fix error on stream stop in mxl111sf_ep6_streaming_ctrl()
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>
Cc: stable@kernel.org
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-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 38ef0253d3b5..81305de2fea5 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) | |||
351 | adap_state->ep6_clockphase, | 351 | adap_state->ep6_clockphase, |
352 | 0, 0); | 352 | 0, 0); |
353 | mxl_fail(ret); | 353 | mxl_fail(ret); |
354 | #if 0 | ||
354 | } else { | 355 | } else { |
355 | ret = mxl111sf_disable_656_port(state); | 356 | ret = mxl111sf_disable_656_port(state); |
356 | mxl_fail(ret); | 357 | mxl_fail(ret); |
358 | #endif | ||
357 | } | 359 | } |
358 | 360 | ||
359 | mxl111sf_read_reg(state, 0x12, &tmp); | ||
360 | tmp &= ~0x04; | ||
361 | mxl111sf_write_reg(state, 0x12, tmp); | ||
362 | |||
363 | return ret; | 361 | return ret; |
364 | } | 362 | } |
365 | 363 | ||