From 768805a9b89e151665a1c1b48abd7228424b0e6c Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Wed, 27 Apr 2011 21:39:57 -0700 Subject: [PATCH] --- yaml --- r: 250495 b: refs/heads/master c: 60c8ba6478bb483ecd6069f566d02e33d319e72e h: refs/heads/master i: 250493: e061b3391e2bcfede1acfc08538890b0a317a778 250491: 590fc5e57635c0d657323504070e6b85074d4a1a 250487: b212f63a552cc0c1eb3c2b1f357a7a752318b228 250479: 5efebacc6aa149ff8a2f369a7146a7ae0c4d96ce 250463: b3db08abcd8d87bebbc0e2fe36a8487d975d2b7f 250431: f60152cacdba6daffa1507059e3baa925d065b91 250367: e7aa42553260ac18cf40b878b4f512968961f5ac v: v3 --- [refs] | 2 +- trunk/drivers/input/keyboard/omap-keypad.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index f1e3c400e939..7ddd844b3683 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 94bb530c247a29f75fc728e5f8374a83d59d7e45 +refs/heads/master: 60c8ba6478bb483ecd6069f566d02e33d319e72e diff --git a/trunk/drivers/input/keyboard/omap-keypad.c b/trunk/drivers/input/keyboard/omap-keypad.c index 0e2a19cb43d8..f23a743817db 100644 --- a/trunk/drivers/input/keyboard/omap-keypad.c +++ b/trunk/drivers/input/keyboard/omap-keypad.c @@ -413,7 +413,7 @@ static int __devinit omap_kp_probe(struct platform_device *pdev) return 0; err5: for (i = irq_idx - 1; i >=0; i--) - free_irq(row_gpios[i], NULL); + free_irq(row_gpios[i], omap_kp); err4: input_unregister_device(omap_kp->input); input_dev = NULL; @@ -444,11 +444,11 @@ static int __devexit omap_kp_remove(struct platform_device *pdev) gpio_free(col_gpios[i]); for (i = 0; i < omap_kp->rows; i++) { gpio_free(row_gpios[i]); - free_irq(gpio_to_irq(row_gpios[i]), NULL); + free_irq(gpio_to_irq(row_gpios[i]), omap_kp); } } else { omap_writew(1, OMAP1_MPUIO_BASE + OMAP_MPUIO_KBD_MASKIT); - free_irq(omap_kp->irq, NULL); + free_irq(omap_kp->irq, omap_kp); } del_timer_sync(&omap_kp->timer);