r3862 - branches/src/target/kernel/2.6.24.x/patches

[werner at sita.openmoko.org]

Author: werner
Date: 2008-01-17 12:13:49 +0100 (Thu, 17 Jan 2008)
New Revision: 3862

Modified:
   branches/src/target/kernel/2.6.24.x/patches/smedia-glamo.patch
Log:
Intended cleanup of interrupt demultiplexer caused breakage :-(

smedia-glamo.patch:
- drivers/mfd/glamo/glamo-core.c (glamo_irq_demux_handler): also interrupt
  number depends on which interrupt we handle, duh



Modified: branches/src/target/kernel/2.6.24.x/patches/smedia-glamo.patch
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/smedia-glamo.patch	2008-01-17 08:35:53 UTC (rev 3861)
+++ branches/src/target/kernel/2.6.24.x/patches/smedia-glamo.patch	2008-01-17 11:13:49 UTC (rev 3862)
@@ -518,7 +518,7 @@
 ===================================================================
 --- /dev/null
 +++ linux-2.6.24-rc7/drivers/mfd/glamo/glamo-core.c
-@@ -0,0 +1,1112 @@
+@@ -0,0 +1,1113 @@
 +/* Smedia Glamo 336x/337x driver
 + *
 + * (C) 2007 by OpenMoko, Inc.
@@ -887,7 +887,8 @@
 +		irqstatus = __reg_read(glamo_handle, GLAMO_REG_IRQ_STATUS);
 +		for (i = 0; i < 9; i++)
 +			if (irqstatus & (1 << i))
-+				desc_handle_irq(irq, irq_desc+IRQ_GLAMO(i));
++				desc_handle_irq(IRQ_GLAMO(i),
++				    irq_desc+IRQ_GLAMO(i));
 +
 +	} while ((desc->status & (IRQ_PENDING | IRQ_DISABLED)) == IRQ_PENDING);
 +