git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
[pandora-kernel.git]
/
arch
/
arm
/
mach-omap2
/
omap_l3_smx.c
diff --git
a/arch/arm/mach-omap2/omap_l3_smx.c
b/arch/arm/mach-omap2/omap_l3_smx.c
index
265bff3
..
5f2da75
100644
(file)
--- a/
arch/arm/mach-omap2/omap_l3_smx.c
+++ b/
arch/arm/mach-omap2/omap_l3_smx.c
@@
-226,7
+226,6
@@
static int __init omap3_l3_probe(struct platform_device *pdev)
struct omap3_l3 *l3;
struct resource *res;
int ret;
struct omap3_l3 *l3;
struct resource *res;
int ret;
- int irq;
l3 = kzalloc(sizeof(*l3), GFP_KERNEL);
if (!l3) {
l3 = kzalloc(sizeof(*l3), GFP_KERNEL);
if (!l3) {
@@
-249,18
+248,17
@@
static int __init omap3_l3_probe(struct platform_device *pdev)
goto err2;
}
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;
}
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);
IRQF_DISABLED | IRQF_TRIGGER_RISING,
"l3-app-irq", l3);
@@
-269,7
+267,6
@@
static int __init omap3_l3_probe(struct platform_device *pdev)
goto err4;
}
goto err4;
}
- l3->app_irq = irq;
goto err0;
err4:
goto err0;
err4: