diff options
author | Magnus Lilja <lilja.magnus@gmail.com> | 2009-05-08 15:57:47 -0400 |
---|---|---|
committer | David Woodhouse <David.Woodhouse@intel.com> | 2009-06-05 12:40:30 -0400 |
commit | b258fd8d0470c65fef5231887d7e97cb246da0d0 (patch) | |
tree | c03b925b3d1ace550ea031ccf3e03054b3bc38bc | |
parent | 260dc003e9fd41a6cac64308e63dea37ea5de13f (diff) |
mtd: mxc_nand: add correct dev_id parameter to free_irq() calls
Make sure to pass the same dev_id data to free_irq() that was
used when calling request_irq(), otherwise we get a warning about
freeing an already free IRQ.
Signed-off-by: Magnus Lilja <lilja.magnus@gmail.com>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
-rw-r--r-- | drivers/mtd/nand/mxc_nand.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c index 65040de54bb7..d5aea6951d0b 100644 --- a/drivers/mtd/nand/mxc_nand.c +++ b/drivers/mtd/nand/mxc_nand.c | |||
@@ -981,7 +981,7 @@ static int __init mxcnd_probe(struct platform_device *pdev) | |||
981 | return 0; | 981 | return 0; |
982 | 982 | ||
983 | escan: | 983 | escan: |
984 | free_irq(host->irq, NULL); | 984 | free_irq(host->irq, host); |
985 | eirq: | 985 | eirq: |
986 | iounmap(host->regs); | 986 | iounmap(host->regs); |
987 | eres: | 987 | eres: |
@@ -1001,7 +1001,7 @@ static int __devexit mxcnd_remove(struct platform_device *pdev) | |||
1001 | platform_set_drvdata(pdev, NULL); | 1001 | platform_set_drvdata(pdev, NULL); |
1002 | 1002 | ||
1003 | nand_release(&host->mtd); | 1003 | nand_release(&host->mtd); |
1004 | free_irq(host->irq, NULL); | 1004 | free_irq(host->irq, host); |
1005 | iounmap(host->regs); | 1005 | iounmap(host->regs); |
1006 | kfree(host); | 1006 | kfree(host); |
1007 | 1007 | ||