lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

V4L/DVB (5694): M920x: fix for Dposh devices

Browse Source 
Make sure devices manufactured by Dposh are not affected by previous hw 
pid filtering changes

Doing so might crash it.

Signed-off-by: Aapo Tahkola <aet@rasterburn.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
Aapo Tahkola
2007-05-08 18:21:47 -03:00
committed by Mauro Carvalho Chehab
parent 55bbe5ea20
commit 3847b22ab5
1 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
drivers/media/dvb/dvb-usb/m920x.c
View File

@@ -59,7 +59,7 @@ static inline int m920x_write(struct usb_device *udev, u8 request,
static int m920x_init(struct dvb_usb_device *d, struct m920x_inits *rc_seq) static int m920x_init(struct dvb_usb_device *d, struct m920x_inits *rc_seq)
{ {
int ret = 0, i, epi; int ret = 0, i, epi, flags = 0;
int adap_enabled[M9206_MAX_ADAPTERS] = { 0 }; int adap_enabled[M9206_MAX_ADAPTERS] = { 0 };
/* Remote controller init. */ /* Remote controller init. */
@@ -79,26 +79,32 @@ static int m920x_init(struct dvb_usb_device *d, struct m920x_inits *rc_seq)
deb("Initialising remote control success\n"); deb("Initialising remote control success\n");
} }
for (i = 0; i < d->props.num_adapters; i++) { for (i = 0; i < d->props.num_adapters; i++)
epi = d->adapter[i].props.stream.endpoint - 0x81; flags |= d->adapter[i].props.caps;
if (epi < 0 || epi >= M9206_MAX_ADAPTERS) { /* Some devices(Dposh) might crash if we attempt touch at all. */
printk(KERN_INFO "m920x: Unexpected adapter endpoint!\n"); if (flags & DVB_USB_ADAP_HAS_PID_FILTER) {
return -EINVAL; for (i = 0; i < d->props.num_adapters; i++) {
epi = d->adapter[i].props.stream.endpoint - 0x81;
if (epi < 0 || epi >= M9206_MAX_ADAPTERS) {
printk(KERN_INFO "m920x: Unexpected adapter endpoint!\n");
return -EINVAL;
}
adap_enabled[epi] = 1;
} }
adap_enabled[epi] = 1; for (i = 0; i < M9206_MAX_ADAPTERS; i++) {
} if (adap_enabled[i])
continue;
for (i = 0; i < M9206_MAX_ADAPTERS; i++) { if ((ret = m920x_set_filter(d, 0x81 + i, 0, 0x0)) != 0)
if (adap_enabled[i]) return ret;
continue;
if ((ret = m920x_set_filter(d, 0x81 + i, 0, 0x0)) != 0) if ((ret = m920x_set_filter(d, 0x81 + i, 0, 0x02f5)) != 0)
return ret; return ret;
}
if ((ret = m920x_set_filter(d, 0x81 + i, 0, 0x02f5)) != 0)
return ret;
} }
return ret; return ret;