]> err.no Git - linux-2.6/commitdiff
USB: ehci-hcd: fix sparse warning about shadowing 'status' symbol
authorMarcin Slusarz <marcin.slusarz@gmail.com>
Sun, 16 Dec 2007 02:25:13 +0000 (03:25 +0100)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 1 Feb 2008 22:34:58 +0000 (14:34 -0800)
fix warning:
drivers/usb/host/ehci-hcd.c:832:8: warning: symbol 'status' shadows an earlier one
drivers/usb/host/ehci-hcd.c:790:71: originally declared here

Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/usb/host/ehci-hcd.c

index 5917c6b7ce3392d6dbb0cc9cdb48ca33f41f0b1e..fb2b227afc4fcdc617b155a49b167b7a077f75db 100644 (file)
@@ -862,16 +862,16 @@ static int ehci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
                /* reschedule QH iff another request is queued */
                if (!list_empty (&qh->qtd_list)
                                && HC_IS_RUNNING (hcd->state)) {
-                       int status;
+                       int schedule_status;
 
-                       status = qh_schedule (ehci, qh);
+                       schedule_status = qh_schedule (ehci, qh);
                        spin_unlock_irqrestore (&ehci->lock, flags);
 
-                       if (status != 0) {
+                       if (schedule_status != 0) {
                                // shouldn't happen often, but ...
                                // FIXME kill those tds' urbs
                                err ("can't reschedule qh %p, err %d",
-                                       qh, status);
+                                       qh, schedule_status);
                        }
                        return status;
                }