summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2008-04-24 08:35:37 -0400
committerJeff Garzik <jgarzik@redhat.com>2008-04-24 08:35:37 -0400
commit0d626239ffe515a64a6b53c70896796f621c635c (patch)
tree453091db20907cf7baef72ffe75792aeeb038150 /arch
parent807501475fce0ebe68baedf87f202c3e4ee0d12c (diff)
downloadop-kernel-dev-0d626239ffe515a64a6b53c70896796f621c635c.zip
op-kernel-dev-0d626239ffe515a64a6b53c70896796f621c635c.tar.gz
arm/mach-integrator/time.c, mwave: revert portions of recent irq cleanups
The recent irq cleanups for arch/arm/mach-integrator/time.c and drivers/char/mwave/tp3780i.c changed the request_irq() dev_id parameter, but neglected to change the matching free_irq() parameter, thus creating a bug upon irq de-registration. Given that the impetus for the changes is not yet accepted upstream, it is best to revert the irq cleanups. Mostly. A comment is added to time.c to reduce future confusion, of type that led to my time.c cleanup in the first place. Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-integrator/time.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/mach-integrator/time.c b/arch/arm/mach-integrator/time.c
index 5235f64..8508a0d 100644
--- a/arch/arm/mach-integrator/time.c
+++ b/arch/arm/mach-integrator/time.c
@@ -124,8 +124,11 @@ static int rtc_probe(struct amba_device *dev, void *id)
xtime.tv_sec = __raw_readl(rtc_base + RTC_DR);
+ /* note that 'dev' is merely used for irq disambiguation;
+ * it is not actually referenced in the irq handler
+ */
ret = request_irq(dev->irq[0], arm_rtc_interrupt, IRQF_DISABLED,
- "rtc-pl030", NULL);
+ "rtc-pl030", dev);
if (ret)
goto map_out;
OpenPOWER on IntegriCloud