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

[werner at sita.openmoko.org]

Author: werner
Date: 2008-01-15 11:42:33 +0100 (Tue, 15 Jan 2008)
New Revision: 3836

Modified:
   branches/src/target/kernel/2.6.24.x/patches/smedia-glamo.patch
Log:
Merger of "glamo-core-fix-irq-demux-desc-lock.patch",
http://git.openmoko.org/?p=kernel.git;a=commit;h=b51600d1168afff39fda4719d97fabcebdc3f8c9
and a further refinement from "glamo-mmc-driver-2.6.24-incomplete.patch"
http://git.openmoko.org/?p=kernel.git;a=commit;h=bce576562d0b4e9c83ac9939bec424862994220f

desc gets overwritten inside the demux handler... it doesn't unlock what it
thinks it does...

Signed-off-by: Andy Green <andy at openmoko.com>

smedia-glamo.patch:
- drivers/mfd/glamo/glamo-core.c (glamo_irq_demux_handler): do not change 
  "desc" pointer when selecting demultiplexed interrupt



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-15 09:03:23 UTC (rev 3835)
+++ branches/src/target/kernel/2.6.24.x/patches/smedia-glamo.patch	2008-01-15 10:42:33 UTC (rev 3836)
@@ -508,7 +508,7 @@
 ===================================================================
 --- /dev/null
 +++ linux-2.6.24-rc7/drivers/mfd/glamo/glamo-core.c
-@@ -0,0 +1,1072 @@
+@@ -0,0 +1,1068 @@
 +/* Smedia Glamo 336x/337x driver
 + *
 + * (C) 2007 by OpenMoko, Inc.
@@ -867,13 +867,9 @@
 +
 +		/* read IRQ status register */
 +		irqstatus = __reg_read(glamo_handle, GLAMO_REG_IRQ_STATUS);
-+		for (i = 0; i < 9; i++) {
-+			if (irqstatus & (1 << i)) {
-+				irq = IRQ_GLAMO(0) + i;
-+				desc = irq_desc + irq;
-+				desc_handle_irq(irq, desc);
-+			}
-+		}
++		for (i = 0; i < 9; i++)
++			if (irqstatus & (1 << i))
++				desc_handle_irq(irq_desc+IRQ_GLAMO(i), desc);
 +
 +	} while ((desc->status & (IRQ_PENDING | IRQ_DISABLED)) == IRQ_PENDING);
 +