3 files changed, 38 insertions, 9 deletions

diff --git a/drivers/media/usb/dvb-usb/dib0700.h b/drivers/media/usb/dvb-usb/dib0700.h
index 637b6123f391..927617d95616 100644
--- a/drivers/media/usb/dvb-usb/dib0700.h
+++ b/drivers/media/usb/dvb-usb/dib0700.h
@@ -59,7 +59,7 @@ extern int dib0700_set_gpio(struct dvb_usb_device *, enum dib07x0_gpios gpio, u8
 extern int dib0700_ctrl_clock(struct dvb_usb_device *d, u32 clk_MHz, u8 clock_out_gp3);
 extern int dib0700_ctrl_rd(struct dvb_usb_device *d, u8 *tx, u8 txlen, u8 *rx, u8 rxlen);
 extern int dib0700_download_firmware(struct usb_device *udev, const struct firmware *fw);
-extern int dib0700_rc_setup(struct dvb_usb_device *d);
+extern int dib0700_rc_setup(struct dvb_usb_device *d, struct usb_interface *intf);
 extern int dib0700_streaming_ctrl(struct dvb_usb_adapter *adap, int onoff);
 extern struct i2c_algorithm dib0700_i2c_algo;
 extern int dib0700_identify_state(struct usb_device *udev, struct dvb_usb_device_properties *props,
diff --git a/drivers/media/usb/dvb-usb/dib0700_core.c b/drivers/media/usb/dvb-usb/dib0700_core.c
index bf2a908d74cf..c14285fa8271 100644
--- a/drivers/media/usb/dvb-usb/dib0700_core.c
+++ b/drivers/media/usb/dvb-usb/dib0700_core.c
@@ -754,17 +754,20 @@ resubmit:
         usb_submit_urb(purb, GFP_ATOMIC);
 }
 
-int dib0700_rc_setup(struct dvb_usb_device *d)
+int dib0700_rc_setup(struct dvb_usb_device *d, struct usb_interface *intf)
 {
         struct dib0700_state *st = d->priv;
         struct urb *purb;
-        int ret;
+        const struct usb_endpoint_descriptor *e;
+        int ret, rc_ep = 1;
+        unsigned int pipe = 0;
 
         /* Poll-based. Don't initialize bulk mode */
-        if (st->fw_version < 0x10200)
+        if (st->fw_version < 0x10200 || !intf)
                 return 0;
 
         /* Starting in firmware 1.20, the RC info is provided on a bulk pipe */
+
         purb = usb_alloc_urb(0, GFP_KERNEL);
         if (purb == NULL) {
                 err("rc usb alloc urb failed");
@@ -779,9 +782,35 @@ int dib0700_rc_setup(struct dvb_usb_device *d)
         }
 
         purb->status = -EINPROGRESS;
-        usb_fill_bulk_urb(purb, d->udev, usb_rcvbulkpipe(d->udev, 1),
-                          purb->transfer_buffer, RC_MSG_SIZE_V1_20,
-                          dib0700_rc_urb_completion, d);
+
+        /*
+         * Some devices like the Hauppauge NovaTD model 52009 use an interrupt
+         * endpoint, while others use a bulk one.
+         */
+        e = &intf->altsetting[0].endpoint[rc_ep].desc;
+        if (usb_endpoint_dir_in(e)) {
+                if (usb_endpoint_xfer_bulk(e)) {
+                        pipe = usb_rcvbulkpipe(d->udev, rc_ep);
+                        usb_fill_bulk_urb(purb, d->udev, pipe,
+                                          purb->transfer_buffer,
+                                          RC_MSG_SIZE_V1_20,
+                                          dib0700_rc_urb_completion, d);
+
+                } else if (usb_endpoint_xfer_int(e)) {
+                        pipe = usb_rcvintpipe(d->udev, rc_ep);
+                        usb_fill_int_urb(purb, d->udev, pipe,
+                                          purb->transfer_buffer,
+                                          RC_MSG_SIZE_V1_20,
+                                          dib0700_rc_urb_completion, d, 1);
+                }
+        }
+
+        if (!pipe) {
+                err("There's no endpoint for remote controller");
+                kfree(purb->transfer_buffer);
+                usb_free_urb(purb);
+                return 0;
+        }
 
         ret = usb_submit_urb(purb, GFP_ATOMIC);
         if (ret) {
@@ -820,7 +849,7 @@ static int dib0700_probe(struct usb_interface *intf,
                         else
                                 dev->props.rc.core.bulk_mode = false;
 
-                        dib0700_rc_setup(dev);
+                        dib0700_rc_setup(dev, intf);
 
                         return 0;
                 }
diff --git a/drivers/media/usb/dvb-usb/dib0700_devices.c b/drivers/media/usb/dvb-usb/dib0700_devices.c
index 829323e42ca0..10e0db8d1850 100644
--- a/drivers/media/usb/dvb-usb/dib0700_devices.c
+++ b/drivers/media/usb/dvb-usb/dib0700_devices.c
@@ -514,7 +514,7 @@ static int dib0700_rc_query_old_firmware(struct dvb_usb_device *d)
 
         /* info("%d: %2X %2X %2X %2X",dvb_usb_dib0700_ir_proto,(int)key[3-2],(int)key[3-3],(int)key[3-1],(int)key[3]);  */
 
-        dib0700_rc_setup(d); /* reset ir sensor data to prevent false events */
+        dib0700_rc_setup(d, NULL); /* reset ir sensor data to prevent false events */
 
         d->last_event = 0;
         switch (d->props.rc.core.protocol) {