From 8514a2b03e1b0d7e1e6e79a5aa26c96a2aa07e63 Mon Sep 17 00:00:00 2001 From: Todd Poynor Date: Mon, 29 Aug 2011 17:42:23 +0530 Subject: [PATCH] --- yaml --- r: 272891 b: refs/heads/master c: c1df2dcc90dc6f5110726e9bdcd2353db989c29d h: refs/heads/master i: 272889: 629468d7dfb9f4ca97f5cd396aeeab1807511459 272887: 7ca1147a6e87723033bf3bf55416c224d2523c50 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-omap2/omap_l3_noc.c | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 298dbe3365df..59ef54770d7e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 342fd144292a6b64ea869e4052eb250486c8f326 +refs/heads/master: c1df2dcc90dc6f5110726e9bdcd2353db989c29d diff --git a/trunk/arch/arm/mach-omap2/omap_l3_noc.c b/trunk/arch/arm/mach-omap2/omap_l3_noc.c index d560c8894e1f..cf237dd4dba5 100644 --- a/trunk/arch/arm/mach-omap2/omap_l3_noc.c +++ b/trunk/arch/arm/mach-omap2/omap_l3_noc.c @@ -124,7 +124,7 @@ static int __init omap4_l3_probe(struct platform_device *pdev) { static struct omap4_l3 *l3; struct resource *res; - int ret, irq; + int ret; l3 = kzalloc(sizeof(*l3), GFP_KERNEL); if (!l3) @@ -176,8 +176,8 @@ static int __init omap4_l3_probe(struct platform_device *pdev) /* * Setup interrupt Handlers */ - irq = platform_get_irq(pdev, 0); - ret = request_irq(irq, + l3->debug_irq = platform_get_irq(pdev, 0); + ret = request_irq(l3->debug_irq, l3_interrupt_handler, IRQF_DISABLED, "l3-dbg-irq", l3); if (ret) { @@ -185,10 +185,9 @@ static int __init omap4_l3_probe(struct platform_device *pdev) OMAP44XX_IRQ_L3_DBG); goto err3; } - l3->debug_irq = irq; - irq = platform_get_irq(pdev, 1); - ret = request_irq(irq, + l3->app_irq = platform_get_irq(pdev, 1); + ret = request_irq(l3->app_irq, l3_interrupt_handler, IRQF_DISABLED, "l3-app-irq", l3); if (ret) { @@ -196,7 +195,6 @@ static int __init omap4_l3_probe(struct platform_device *pdev) OMAP44XX_IRQ_L3_APP); goto err4; } - l3->app_irq = irq; return 0;