diff options
author | Jiri Kosina <jkosina@suse.cz> | 2008-07-07 11:30:31 +0200 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2008-07-07 11:30:31 +0200 |
commit | d6d6a86e14a6b5a26c785b45268874a8f7a52b4d (patch) | |
tree | cd49bacdc4ac89a9317501bc9ebe87c3b6320e3e /drivers/usb/host/isp1760-hcd.c | |
parent | f38bb7de289f5c15e287386d35e9c325f1062c49 (diff) | |
parent | 1b40a895df6c7d5a80e71f65674060b03d84bbef (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/usb/host/isp1760-hcd.c')
-rw-r--r-- | drivers/usb/host/isp1760-hcd.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/usb/host/isp1760-hcd.c b/drivers/usb/host/isp1760-hcd.c index c9cec873826..65aa5ecf569 100644 --- a/drivers/usb/host/isp1760-hcd.c +++ b/drivers/usb/host/isp1760-hcd.c @@ -2207,14 +2207,14 @@ struct usb_hcd *isp1760_register(u64 res_start, u64 res_len, int irq, goto err_put; } - ret = usb_add_hcd(hcd, irq, irqflags); - if (ret) - goto err_unmap; - hcd->irq = irq; hcd->rsrc_start = res_start; hcd->rsrc_len = res_len; + ret = usb_add_hcd(hcd, irq, irqflags); + if (ret) + goto err_unmap; + return hcd; err_unmap: |