summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAshok G <ashok.g@stericsson.com>2012-02-27 12:36:12 +0530
committerPhilippe Langlais <philippe.langlais@stericsson.com>2012-05-22 11:03:40 +0200
commit5409adc138caf18a6399a0c69d9a73fc858983c7 (patch)
treef6eec60de9bfff91d7fd39488a118c1280613a1b
parent31d89ec8bed559e5f047e253031e5fd4a2bf6ca1 (diff)
nomadik-ske-keypad: Stop using already free'd pointer
St-Ericsson Linux next: NA St-Ericsson Id: 419847 St-Ericsson FOSS-OUT ID: Trivial Change-Id: I18ee7489264da7a84081486f95e07a5be29a987a Signed-off-by: Ashok G <ashok.g@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/50529 Reviewed-by: Naga RADHESH Y <naga.radheshy@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
-rw-r--r--drivers/input/keyboard/nomadik-ske-keypad.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/keyboard/nomadik-ske-keypad.c b/drivers/input/keyboard/nomadik-ske-keypad.c
index 156f64b1339..6a0707f7f76 100644
--- a/drivers/input/keyboard/nomadik-ske-keypad.c
+++ b/drivers/input/keyboard/nomadik-ske-keypad.c
@@ -850,7 +850,6 @@ static int __devexit ske_keypad_remove(struct platform_device *pdev)
kfree(keypad->keys);
kfree(keypad->ske_cols);
kfree(keypad->ske_rows);
- kfree(keypad->gpio_input_irq);
input_unregister_device(keypad->input);
sysfs_remove_group(&pdev->dev.kobj, &ske_attr_group);
@@ -869,6 +868,7 @@ static int __devexit ske_keypad_remove(struct platform_device *pdev)
for (i = 0; i < keypad->board->krow; i++)
free_irq(keypad->gpio_input_irq[i], keypad);
+ kfree(keypad->gpio_input_irq);
free_irq(keypad->irq, keypad);
regulator_put(keypad->regulator);