aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMarcus Folkesson <marcus.folkesson@gmail.com>2012-05-03 15:56:36 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-06-01 15:13:01 +0800
commitd19adfe6caf97ceb57ca460992fedd7a6e75a915 (patch)
treef9f64ce91862239cd2a913345a9cd7054cdc71ff /drivers
parentab55458eb0cc7f0f23e38ed41828e9b5a5372134 (diff)
downloadkernel_samsung_aries-d19adfe6caf97ceb57ca460992fedd7a6e75a915.zip
kernel_samsung_aries-d19adfe6caf97ceb57ca460992fedd7a6e75a915.tar.gz
kernel_samsung_aries-d19adfe6caf97ceb57ca460992fedd7a6e75a915.tar.bz2
i2c: davinci: Free requested IRQ in remove
commit 9868a060ccf769c08ec378a9829137e272e9a92c upstream. The freed IRQ is not necessary the one requested in probe. Even if it was, with two or more i2c-controllers it will fails anyway. Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com> Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/i2c/busses/i2c-davinci.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-davinci.c b/drivers/i2c/busses/i2c-davinci.c
index a76d85f..79b4bcb 100644
--- a/drivers/i2c/busses/i2c-davinci.c
+++ b/drivers/i2c/busses/i2c-davinci.c
@@ -755,7 +755,7 @@ static int davinci_i2c_remove(struct platform_device *pdev)
dev->clk = NULL;
davinci_i2c_write_reg(dev, DAVINCI_I2C_MDR_REG, 0);
- free_irq(IRQ_I2C, dev);
+ free_irq(dev->irq, dev);
iounmap(dev->base);
kfree(dev);