Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 2 insertions, 3 deletions

diff --git a/drivers/usb/host/ohci-sh.c b/drivers/usb/host/ohci-sh.c
index 60f03cc7ec4f..f47867ff78c7 100644
--- a/drivers/usb/host/ohci-sh.c
+++ b/drivers/usb/host/ohci-sh.c
@@ -77,7 +77,6 @@ static const struct hc_driver ohci_sh_hc_driver = {
 
 /*-------------------------------------------------------------------------*/
 
-#define resource_len(r) (((r)->end - (r)->start) + 1)
 static int ohci_hcd_sh_probe(struct platform_device *pdev)
 {
         struct resource *res = NULL;
@@ -109,8 +108,8 @@ static int ohci_hcd_sh_probe(struct platform_device *pdev)
 
         hcd->regs = (void __iomem *)res->start;
         hcd->rsrc_start = res->start;
-        hcd->rsrc_len = resource_len(res);
-        ret = usb_add_hcd(hcd, irq, IRQF_DISABLED);
+        hcd->rsrc_len = resource_size(res);
+        ret = usb_add_hcd(hcd, irq, IRQF_DISABLED | IRQF_SHARED);
         if (ret != 0) {
                 err("Failed to add hcd");
                 usb_put_hcd(hcd);