Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 104604
b: refs/heads/master
c: 0bf32b8
h: refs/heads/master
v: v3
  • Loading branch information
Yoshihiro Shimoda authored and Greg Kroah-Hartman committed Jul 21, 2008
1 parent 5e00c1e commit f80f3f8
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 742120c63138651c898614001cb58cd607401eac
refs/heads/master: 0bf32b807ff28bb71012f60660e97e79408252ce
7 changes: 6 additions & 1 deletion trunk/drivers/usb/host/r8a66597-hcd.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit f80f3f8

Please sign in to comment.