From 46a1beed3b02f04ec91c9d355bb894ca1d2d78a3 Mon Sep 17 00:00:00 2001 From: David Brownell Date: Tue, 15 Apr 2008 01:31:33 -0400 Subject: [PATCH] --- yaml --- r: 93241 b: refs/heads/master c: da3e4c885e5ebbccc8181f53d8ae74c4c22d506f h: refs/heads/master i: 93239: 5ad2e2f545421236cdca3a5e76082ba2550187b4 v: v3 --- [refs] | 2 +- trunk/drivers/input/keyboard/omap-keypad.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d095f6accee3..6447994beb6a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1164ec1ae43770db6ea5450c6cac0761b11d6d1d +refs/heads/master: da3e4c885e5ebbccc8181f53d8ae74c4c22d506f diff --git a/trunk/drivers/input/keyboard/omap-keypad.c b/trunk/drivers/input/keyboard/omap-keypad.c index babc913d5492..eec328167f8d 100644 --- a/trunk/drivers/input/keyboard/omap-keypad.c +++ b/trunk/drivers/input/keyboard/omap-keypad.c @@ -352,6 +352,9 @@ static int __init omap_kp_probe(struct platform_device *pdev) } omap_set_gpio_direction(row_gpios[row_idx], 1); } + } else { + col_idx = 0; + row_idx = 0; } setup_timer(&omap_kp->timer, omap_kp_timer, (unsigned long)omap_kp); @@ -415,10 +418,10 @@ static int __init omap_kp_probe(struct platform_device *pdev) err3: device_remove_file(&pdev->dev, &dev_attr_enable); err2: - for (i = row_idx-1; i >=0; i--) + for (i = row_idx - 1; i >=0; i--) omap_free_gpio(row_gpios[i]); err1: - for (i = col_idx-1; i >=0; i--) + for (i = col_idx - 1; i >=0; i--) omap_free_gpio(col_gpios[i]); kfree(omap_kp);