mtd: mxc_nand: add correct dev_id parameter to free_irq() calls

Linux-MTD Mailing List linux-mtd at lists.infradead.org
Fri Jun 5 14:59:09 EDT 2009


Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=b258fd8d0470c65fef5231887d7e97cb246da0d0
Commit:     b258fd8d0470c65fef5231887d7e97cb246da0d0
Parent:     260dc003e9fd41a6cac64308e63dea37ea5de13f
Author:     Magnus Lilja <lilja.magnus at gmail.com>
AuthorDate: Fri May 8 21:57:47 2009 +0200
Committer:  David Woodhouse <David.Woodhouse at intel.com>
CommitDate: Fri Jun 5 17:40:30 2009 +0100

    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 at gmail.com>
    Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy at nokia.com>
    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
---
 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 65040de..d5aea69 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)
 	return 0;
 
 escan:
-	free_irq(host->irq, NULL);
+	free_irq(host->irq, host);
 eirq:
 	iounmap(host->regs);
 eres:
@@ -1001,7 +1001,7 @@ static int __devexit mxcnd_remove(struct platform_device *pdev)
 	platform_set_drvdata(pdev, NULL);
 
 	nand_release(&host->mtd);
-	free_irq(host->irq, NULL);
+	free_irq(host->irq, host);
 	iounmap(host->regs);
 	kfree(host);
 



More information about the linux-mtd-cvs mailing list