[pkg-fso-commits] [SCM] linux-2.6-openmoko, the Linux 2.6 kernel tree from Openmoko branch, andy-tracking, updated. upstream/20090303.gitb9de904e-140-g23b564c

[Nelson Castillo]

The following commit has been merged in the andy-tracking branch:
commit 0b9d21bf5d05d5dd909425a67a8be2eb1c1fc579
Author: Michael Trimarchi <michael at panicking.kicks-ass.org>
Date:   Tue Apr 21 11:23:42 2009 -0500

    This patch take the min platform data array size and keys array size.
    
    Signed-off-by: Michael Trimarchi <michael at panicking.kicks-ass.org>

diff --git a/drivers/input/keyboard/neo1973kbd.c b/drivers/input/keyboard/neo1973kbd.c
index 56d3a68..a95dd58 100644
--- a/drivers/input/keyboard/neo1973kbd.c
+++ b/drivers/input/keyboard/neo1973kbd.c
@@ -368,8 +368,7 @@ static int neo1973kbd_probe(struct platform_device *pdev)
 		goto out_device_create_file;
 
 	/* register GPIO IRQs */
-
-	for(n = 0; n < ARRAY_SIZE(keys); n++) {
+	for(n = 0; n < min(pdev->num_resources, ARRAY_SIZE(keys)); n++) {
 
 		if (!pdev->resource[0].start)
 			continue;

-- 
linux-2.6-openmoko, the Linux 2.6 kernel tree from Openmoko