Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 242931
b: refs/heads/master
c: 18a8101
h: refs/heads/master
i:
  242929: d24b207
  242927: 79028ac
v: v3
  • Loading branch information
Aaro Koskinen authored and Tony Lindgren committed Mar 18, 2011
1 parent b891fbc commit db4f6d1
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 8 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: 36133869c4b5b70e6acf6ff7ce25df526a6d5cae
refs/heads/master: 18a81019b851dae83f7df3e72064de706788ff25
11 changes: 4 additions & 7 deletions trunk/arch/arm/mach-omap2/omap_l3_smx.c
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,6 @@ static int __init omap3_l3_probe(struct platform_device *pdev)
struct omap3_l3 *l3;
struct resource *res;
int ret;
int irq;

l3 = kzalloc(sizeof(*l3), GFP_KERNEL);
if (!l3) {
Expand All @@ -249,18 +248,17 @@ static int __init omap3_l3_probe(struct platform_device *pdev)
goto err2;
}

irq = platform_get_irq(pdev, 0);
ret = request_irq(irq, omap3_l3_app_irq,
l3->debug_irq = platform_get_irq(pdev, 0);
ret = request_irq(l3->debug_irq, omap3_l3_app_irq,
IRQF_DISABLED | IRQF_TRIGGER_RISING,
"l3-debug-irq", l3);
if (ret) {
dev_err(&pdev->dev, "couldn't request debug irq\n");
goto err3;
}
l3->debug_irq = irq;

irq = platform_get_irq(pdev, 1);
ret = request_irq(irq, omap3_l3_app_irq,
l3->app_irq = platform_get_irq(pdev, 1);
ret = request_irq(l3->app_irq, omap3_l3_app_irq,
IRQF_DISABLED | IRQF_TRIGGER_RISING,
"l3-app-irq", l3);

Expand All @@ -269,7 +267,6 @@ static int __init omap3_l3_probe(struct platform_device *pdev)
goto err4;
}

l3->app_irq = irq;
goto err0;

err4:
Expand Down

0 comments on commit db4f6d1

Please sign in to comment.