lmedm04: Fix usb_submit_urb BOGUS urb xfer, pipe 1 != type 3 in interrupt urb

commit 15e1ce33182d1d5dbd8efe8d382b9352dc857527 upstream.

A quirk of some older firmwares that report endpoint pipe type as PIPE_BULK
but the endpoint otheriwse functions as interrupt.

Check if usb_endpoint_type is USB_ENDPOINT_XFER_BULK and set as usb_rcvbulkpipe.

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/media/usb/dvb-usb-v2/lmedm04.c b/drivers/media/usb/dvb-usb-v2/lmedm04.c
index f674dc024d06cc992e12670a7284bcff998d58dd..d2a4e6d40bf05a307f8bab87b4ce40d55f6d8922 100644 (file)
--- a/drivers/media/usb/dvb-usb-v2/lmedm04.c
+++ b/drivers/media/usb/dvb-usb-v2/lmedm04.c
@@ -350,6 +350,7 @@ static int lme2510_int_read(struct dvb_usb_adapter *adap)
 {
        struct dvb_usb_device *d = adap_to_d(adap);
        struct lme2510_state *lme_int = adap_to_priv(adap);
+       struct usb_host_endpoint *ep;
 
        lme_int->lme_urb = usb_alloc_urb(0, GFP_ATOMIC);
 
@@ -371,6 +372,12 @@ static int lme2510_int_read(struct dvb_usb_adapter *adap)
                                adap,
                                8);
 
+       /* Quirk of pipe reporting PIPE_BULK but behaves as interrupt */
+       ep = usb_pipe_endpoint(d->udev, lme_int->lme_urb->pipe);
+
+       if (usb_endpoint_type(&ep->desc) == USB_ENDPOINT_XFER_BULK)
+               lme_int->lme_urb->pipe = usb_rcvbulkpipe(d->udev, 0xa),
+
        lme_int->lme_urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
 
        usb_submit_urb(lme_int->lme_urb, GFP_ATOMIC);