Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[~andy/linux] / drivers / media / rc / ttusbir.c

diff --git a/drivers/media/rc/ttusbir.c b/drivers/media/rc/ttusbir.c
index 78be8a91422533d7c6396dabadabb7af148a31a9..891762d167edb29d18f154b11102f2559911a602 100644 (file)
--- a/drivers/media/rc/ttusbir.c
+++ b/drivers/media/rc/ttusbir.c
@@ -213,19 +213,20 @@ static int ttusbir_probe(struct usb_interface *intf,
 
        /* find the correct alt setting */
        for (i = 0; i < intf->num_altsetting && altsetting == -1; i++) {
-               int bulk_out_endp = -1, iso_in_endp = -1;
+               int max_packet, bulk_out_endp = -1, iso_in_endp = -1;
 
                idesc = &intf->altsetting[i].desc;
 
                for (j = 0; j < idesc->bNumEndpoints; j++) {
                        desc = &intf->altsetting[i].endpoint[j].desc;
+                       max_packet = le16_to_cpu(desc->wMaxPacketSize);
                        if (usb_endpoint_dir_in(desc) &&
                                        usb_endpoint_xfer_isoc(desc) &&
-                                       desc->wMaxPacketSize == 0x10)
+                                       max_packet == 0x10)
                                iso_in_endp = j;
                        else if (usb_endpoint_dir_out(desc) &&
                                        usb_endpoint_xfer_bulk(desc) &&
-                                       desc->wMaxPacketSize == 0x20)
+                                       max_packet == 0x20)
                                bulk_out_endp = j;
 
                        if (bulk_out_endp != -1 && iso_in_endp != -1) {
@@ -346,6 +347,7 @@ static int ttusbir_probe(struct usb_interface *intf,
        return 0;
 out3:
        rc_unregister_device(rc);
+       rc = NULL;
 out2:
        led_classdev_unregister(&tt->led);
 out:
@@ -408,9 +410,8 @@ static int ttusbir_resume(struct usb_interface *intf)
        struct ttusbir *tt = usb_get_intfdata(intf);
        int i, rc;
 
-       led_classdev_resume(&tt->led);
        tt->is_led_on = true;
-       ttusbir_set_led(tt);
+       led_classdev_resume(&tt->led);
 
        for (i = 0; i < NUM_URBS; i++) {
                rc = usb_submit_urb(tt->urb[i], GFP_KERNEL);