summaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb/dvb-usb/dvb-usb-urb.c
diff options
context:
space:
mode:
authorMichael Krufky <mkrufky@kernellabs.com>2010-01-31 21:06:10 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-05-18 00:47:06 -0300
commit4605664bd94ed94ab65a00bc7c749704304cfd40 (patch)
tree05397774fa18a130567e36610bbd75852f3649f6 /drivers/media/dvb/dvb-usb/dvb-usb-urb.c
parent727e625cc2c114e449a78f851b0c12edac897a83 (diff)
downloadtalos-op-linux-4605664bd94ed94ab65a00bc7c749704304cfd40.tar.gz
talos-op-linux-4605664bd94ed94ab65a00bc7c749704304cfd40.zip
V4L/DVB: dvb-usb: enable specifying a separate generic bulk ctrl response endpoint
Some DVB USB devices use a separate endpoint for responses to control messages sent with bulk transfers via the generic_bulk_ctrl_endpoint. When generic_bulk_ctrl_endpoint_response is set, it will be used instead of the generic_bulk_ctrl_endpoint when reading usb responses in the dvb_usb_generic_rw helper function. Signed-off-by: Michael Krufky <mkrufky@kernellabs.com> Reviewed-by: Patrick Boettcher <pboettcher@kernellabs.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/dvb/dvb-usb/dvb-usb-urb.c')
-rw-r--r--drivers/media/dvb/dvb-usb/dvb-usb-urb.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-urb.c b/drivers/media/dvb/dvb-usb/dvb-usb-urb.c
index 6fe71c6745eb..bb46ba6a3573 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-urb.c
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-urb.c
@@ -42,6 +42,8 @@ int dvb_usb_generic_rw(struct dvb_usb_device *d, u8 *wbuf, u16 wlen, u8 *rbuf,
msleep(delay_ms);
ret = usb_bulk_msg(d->udev,usb_rcvbulkpipe(d->udev,
+ d->props.generic_bulk_ctrl_endpoint_response ?
+ d->props.generic_bulk_ctrl_endpoint_response :
d->props.generic_bulk_ctrl_endpoint),rbuf,rlen,&actlen,
2000);
OpenPOWER on IntegriCloud