summaryrefslogtreecommitdiff
path: root/drivers/usb/core
diff options
context:
space:
mode:
authorSarah Sharp <sarah.a.sharp@linux.intel.com>2010-12-01 20:22:05 +0300
committerSarah Sharp <sarah.a.sharp@linux.intel.com>2011-03-14 04:07:08 +0300
commitabc4f9b099e9e7db3f6f945210aee125571c236d (patch)
tree9cf11c0eed0646885ca8950cd610464d40cfaa67 /drivers/usb/core
parentda13051cc756756f10b2da8ea97b05bdf84bd7bb (diff)
downloadlinux-abc4f9b099e9e7db3f6f945210aee125571c236d.tar.xz
USB: Fix usb_add_hcd() checkpatch errors.
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>
Diffstat (limited to 'drivers/usb/core')
-rw-r--r--drivers/usb/core/hcd.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
index e7d0c4571bbe..b70db6e78977 100644
--- a/drivers/usb/core/hcd.c
+++ b/drivers/usb/core/hcd.c
@@ -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;
@@ -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;
}