]> git.karo-electronics.de Git - mv-sheeva.git/commitdiff
USB: musb: musb_host: fix sparse warning
authorFelipe Balbi <felipe.balbi@nokia.com>
Fri, 4 Dec 2009 13:47:47 +0000 (15:47 +0200)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 11 Dec 2009 19:55:28 +0000 (11:55 -0800)
Fix the following sparse warning:

drivers/usb/musb/musb_host.c:1642:9: warning: symbol 'status' shadows an earlier one

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/usb/musb/musb_host.c

index e3ab40a966eb4ce4f5b9a35eecdbf1ed49e48477..74c4c3698f1ebbff7511b85b78a1010a284eba4a 100644 (file)
@@ -1642,18 +1642,18 @@ void musb_host_rx(struct musb *musb, u8 epnum)
                        c = musb->dma_controller;
 
                        if (usb_pipeisoc(pipe)) {
-                               int status = 0;
+                               int d_status = 0;
                                struct usb_iso_packet_descriptor *d;
 
                                d = urb->iso_frame_desc + qh->iso_idx;
 
                                if (iso_err) {
-                                       status = -EILSEQ;
+                                       d_status = -EILSEQ;
                                        urb->error_count++;
                                }
                                if (rx_count > d->length) {
-                                       if (status == 0) {
-                                               status = -EOVERFLOW;
+                                       if (d_status == 0) {
+                                               d_status = -EOVERFLOW;
                                                urb->error_count++;
                                        }
                                        DBG(2, "** OVERFLOW %d into %d\n",\
@@ -1662,7 +1662,7 @@ void musb_host_rx(struct musb *musb, u8 epnum)
                                        length = d->length;
                                } else
                                        length = rx_count;
-                               d->status = status;
+                               d->status = d_status;
                                buf = urb->transfer_dma + d->offset;
                        } else {
                                length = rx_count;