diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-11-29 04:51:07 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-11-29 04:51:07 -0500 |
| commit | 0d2cd91bf7b1a7cc1d638296111fcc2bcf5c0bb4 (patch) | |
| tree | d2ca69347816c27f9dc352581f5d0fe76811cd49 /drivers/usb/host/ohci-sh.c | |
| parent | 3d95fd6ad8d3cf582a70ed65660017114b6e4065 (diff) | |
| parent | caca6a03d365883564885f2c1da3e88dcf65d139 (diff) | |
Merge commit 'v3.2-rc3' into next
Diffstat (limited to 'drivers/usb/host/ohci-sh.c')
| -rw-r--r-- | drivers/usb/host/ohci-sh.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/ohci-sh.c b/drivers/usb/host/ohci-sh.c index 14cecb52a9fe..afc4eb6bb9d0 100644 --- a/drivers/usb/host/ohci-sh.c +++ b/drivers/usb/host/ohci-sh.c | |||
| @@ -109,7 +109,7 @@ static int ohci_hcd_sh_probe(struct platform_device *pdev) | |||
| 109 | hcd->regs = (void __iomem *)res->start; | 109 | hcd->regs = (void __iomem *)res->start; |
| 110 | hcd->rsrc_start = res->start; | 110 | hcd->rsrc_start = res->start; |
| 111 | hcd->rsrc_len = resource_size(res); | 111 | hcd->rsrc_len = resource_size(res); |
| 112 | ret = usb_add_hcd(hcd, irq, IRQF_DISABLED | IRQF_SHARED); | 112 | ret = usb_add_hcd(hcd, irq, IRQF_SHARED); |
| 113 | if (ret != 0) { | 113 | if (ret != 0) { |
| 114 | err("Failed to add hcd"); | 114 | err("Failed to add hcd"); |
| 115 | usb_put_hcd(hcd); | 115 | usb_put_hcd(hcd); |