1 files changed, 14 insertions, 7 deletions

diff --git a/drivers/usb/host/isp1362-hcd.c b/drivers/usb/host/isp1362-hcd.c
index 8d3104441f16..42971657fde2 100644
--- a/drivers/usb/host/isp1362-hcd.c
+++ b/drivers/usb/host/isp1362-hcd.c
@@ -2697,6 +2697,8 @@ static int __init isp1362_probe(struct platform_device *pdev)
         void __iomem *data_reg;
         int irq;
         int retval = 0;
+        struct resource *irq_res;
+        unsigned int irq_flags = 0;
 
         /* basic sanity checks first.  board-specific init logic should
          * have initialized this the three resources and probably board
@@ -2710,11 +2712,12 @@ static int __init isp1362_probe(struct platform_device *pdev)
 
         data = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         addr = platform_get_resource(pdev, IORESOURCE_MEM, 1);
-        irq = platform_get_irq(pdev, 0);
-        if (!addr || !data || irq < 0) {
+        irq_res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
+        if (!addr || !data || !irq_res) {
                 retval = -ENODEV;
                 goto err1;
         }
+        irq = irq_res->start;
 
 #ifdef CONFIG_USB_HCD_DMA
         if (pdev->dev.dma_mask) {
@@ -2781,12 +2784,16 @@ static int __init isp1362_probe(struct platform_device *pdev)
         }
 #endif
 
-#ifdef CONFIG_ARM
-        if (isp1362_hcd->board)
-                set_irq_type(irq, isp1362_hcd->board->int_act_high ? IRQT_RISING : IRQT_FALLING);
-#endif
+        if (irq_res->flags & IORESOURCE_IRQ_HIGHEDGE)
+                irq_flags |= IRQF_TRIGGER_RISING;
+        if (irq_res->flags & IORESOURCE_IRQ_LOWEDGE)
+                irq_flags |= IRQF_TRIGGER_FALLING;
+        if (irq_res->flags & IORESOURCE_IRQ_HIGHLEVEL)
+                irq_flags |= IRQF_TRIGGER_HIGH;
+        if (irq_res->flags & IORESOURCE_IRQ_LOWLEVEL)
+                irq_flags |= IRQF_TRIGGER_LOW;
 
-        retval = usb_add_hcd(hcd, irq, IRQF_TRIGGER_LOW | IRQF_DISABLED | IRQF_SHARED);
+        retval = usb_add_hcd(hcd, irq, irq_flags | IRQF_DISABLED | IRQF_SHARED);
         if (retval != 0)
                 goto err6;
         pr_info("%s, irq %d\n", hcd->product_desc, irq);