Skip to content

Commit

Permalink
USB: Fix usb_add_hcd() checkpatch errors.
Browse files Browse the repository at this point in the history
The irq enabling code is going to be refactored into a new function, so
clean up some checkpatch errors before moving it.

Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
  • Loading branch information
Sarah Sharp committed Mar 14, 2011
1 parent da13051 commit abc4f9b
Showing 1 changed file with 7 additions and 4 deletions.
11 changes: 7 additions & 4 deletions drivers/usb/core/hcd.c
Original file line number Diff line number Diff line change
Expand Up @@ -2325,10 +2325,12 @@ int usb_add_hcd(struct usb_hcd *hcd,

snprintf(hcd->irq_descr, sizeof(hcd->irq_descr), "%s:usb%d",
hcd->driver->description, hcd->self.busnum);
if ((retval = request_irq(irqnum, &usb_hcd_irq, irqflags,
hcd->irq_descr, hcd)) != 0) {
retval = request_irq(irqnum, &usb_hcd_irq, irqflags,
hcd->irq_descr, hcd);
if (retval != 0) {
dev_err(hcd->self.controller,
"request interrupt %d failed\n", irqnum);
"request interrupt %d failed\n",
irqnum);
goto err_request_irq;
}
hcd->irq = irqnum;
Expand All @@ -2345,7 +2347,8 @@ int usb_add_hcd(struct usb_hcd *hcd,
(unsigned long long)hcd->rsrc_start);
}

if ((retval = hcd->driver->start(hcd)) < 0) {
retval = hcd->driver->start(hcd);
if (retval < 0) {
dev_err(hcd->self.controller, "startup error %d\n", retval);
goto err_hcd_driver_start;
}
Expand Down

0 comments on commit abc4f9b

Please sign in to comment.