diff options
author | Alan Stern <stern@rowland.harvard.edu> | 2007-08-24 15:42:52 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-10-12 17:55:24 -0400 |
commit | e015268d2fcfcaef70a1ec535e6381f75aafbf81 (patch) | |
tree | 03da17d64b3388ca2d39d32398f942f487977b11 /drivers/usb/core/hub.c | |
parent | 1431d2a44ccf68a547094976f363f94177ab00c6 (diff) |
USB: remove traces of urb->status from usbcore
This patch (as981) removes the remaining nontrivial usages of
urb->status from usbcore.
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/core/hub.c')
-rw-r--r-- | drivers/usb/core/hub.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c index 4c495c4d5053..bd08d51d7f41 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c | |||
@@ -347,11 +347,11 @@ void usb_kick_khubd(struct usb_device *hdev) | |||
347 | static void hub_irq(struct urb *urb) | 347 | static void hub_irq(struct urb *urb) |
348 | { | 348 | { |
349 | struct usb_hub *hub = urb->context; | 349 | struct usb_hub *hub = urb->context; |
350 | int status; | 350 | int status = urb->status; |
351 | int i; | 351 | int i; |
352 | unsigned long bits; | 352 | unsigned long bits; |
353 | 353 | ||
354 | switch (urb->status) { | 354 | switch (status) { |
355 | case -ENOENT: /* synchronous unlink */ | 355 | case -ENOENT: /* synchronous unlink */ |
356 | case -ECONNRESET: /* async unlink */ | 356 | case -ECONNRESET: /* async unlink */ |
357 | case -ESHUTDOWN: /* hardware going away */ | 357 | case -ESHUTDOWN: /* hardware going away */ |
@@ -359,10 +359,10 @@ static void hub_irq(struct urb *urb) | |||
359 | 359 | ||
360 | default: /* presumably an error */ | 360 | default: /* presumably an error */ |
361 | /* Cause a hub reset after 10 consecutive errors */ | 361 | /* Cause a hub reset after 10 consecutive errors */ |
362 | dev_dbg (hub->intfdev, "transfer --> %d\n", urb->status); | 362 | dev_dbg (hub->intfdev, "transfer --> %d\n", status); |
363 | if ((++hub->nerrors < 10) || hub->error) | 363 | if ((++hub->nerrors < 10) || hub->error) |
364 | goto resubmit; | 364 | goto resubmit; |
365 | hub->error = urb->status; | 365 | hub->error = status; |
366 | /* FALL THROUGH */ | 366 | /* FALL THROUGH */ |
367 | 367 | ||
368 | /* let khubd handle things */ | 368 | /* let khubd handle things */ |