From f80f3f870db5c13e64dcd4eadc2b1c1f00e1d0b9 Mon Sep 17 00:00:00 2001 From: Yoshihiro Shimoda Date: Fri, 27 Jun 2008 19:09:55 +0900 Subject: [PATCH] --- yaml --- r: 104604 b: refs/heads/master c: 0bf32b807ff28bb71012f60660e97e79408252ce h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/usb/host/r8a66597-hcd.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 5d2ca159607a..167a786ec8e9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 742120c63138651c898614001cb58cd607401eac +refs/heads/master: 0bf32b807ff28bb71012f60660e97e79408252ce diff --git a/trunk/drivers/usb/host/r8a66597-hcd.c b/trunk/drivers/usb/host/r8a66597-hcd.c index a93d80b56974..4db0107f3178 100644 --- a/trunk/drivers/usb/host/r8a66597-hcd.c +++ b/trunk/drivers/usb/host/r8a66597-hcd.c @@ -2244,6 +2244,7 @@ static int __init r8a66597_probe(struct platform_device *pdev) struct r8a66597 *r8a66597; int ret = 0; int i; + unsigned long irq_trigger; if (pdev->dev.dma_mask) { ret = -EINVAL; @@ -2302,7 +2303,11 @@ static int __init r8a66597_probe(struct platform_device *pdev) INIT_LIST_HEAD(&r8a66597->child_device); hcd->rsrc_start = res->start; - ret = usb_add_hcd(hcd, irq, IRQF_DISABLED); + if (irq_sense == INTL) + irq_trigger = IRQF_TRIGGER_LOW; + else + irq_trigger = IRQF_TRIGGER_FALLING; + ret = usb_add_hcd(hcd, irq, IRQF_DISABLED | irq_trigger); if (ret != 0) { err("Failed to add hcd"); goto clean_up;