summaryrefslogtreecommitdiffstats
path: root/drivers/usb/host
diff options
context:
space:
mode:
authorMarcin Slusarz <marcin.slusarz@gmail.com>2007-12-16 03:25:13 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2008-02-01 23:34:58 +0100
commitf570728f89c9d4b262f7c180e5a8e230e675af0c (patch)
tree7fbeab1eb696f87234dd2d6d0edd02f00537fc28 /drivers/usb/host
parentUSB: usbdevfs_urb: __user annotation (diff)
downloadlinux-f570728f89c9d4b262f7c180e5a8e230e675af0c.tar.xz
linux-f570728f89c9d4b262f7c180e5a8e230e675af0c.zip
USB: ehci-hcd: fix sparse warning about shadowing 'status' symbol
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>
Diffstat (limited to 'drivers/usb/host')
-rw-r--r--drivers/usb/host/ehci-hcd.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index 5917c6b7ce33..fb2b227afc4f 100644
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -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;
}