diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-11-21 11:00:28 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-11-21 14:01:05 -0500 |
commit | f8d5e5a8f5be475796c7f357e43546c2d7f44540 (patch) | |
tree | 39a9be12ecee97de5809922be790fa73ee0d2f94 | |
parent | 1508c99506b5d57b8892a5d759176000c88c93b6 (diff) |
ARM: PNX4008: i2c-pnx: use the same dev_id for request_irq and free_irq
This allows i2c-pnx to free its interrupt handler when the module
is removed or if an error occurs; using the same dev_id for both
request_irq and free_irq is desirable.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Acked-by: Ben Dooks <ben-linux@fluff.org>
-rw-r--r-- | drivers/i2c/busses/i2c-pnx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/i2c/busses/i2c-pnx.c b/drivers/i2c/busses/i2c-pnx.c index 1fca59077949..fbab6846ae64 100644 --- a/drivers/i2c/busses/i2c-pnx.c +++ b/drivers/i2c/busses/i2c-pnx.c | |||
@@ -650,7 +650,7 @@ static int __devinit i2c_pnx_probe(struct platform_device *pdev) | |||
650 | return 0; | 650 | return 0; |
651 | 651 | ||
652 | out_irq: | 652 | out_irq: |
653 | free_irq(alg_data->irq, alg_data); | 653 | free_irq(alg_data->irq, i2c_pnx->adapter); |
654 | out_clock: | 654 | out_clock: |
655 | i2c_pnx->set_clock_stop(pdev); | 655 | i2c_pnx->set_clock_stop(pdev); |
656 | out_unmap: | 656 | out_unmap: |
@@ -669,7 +669,7 @@ static int __devexit i2c_pnx_remove(struct platform_device *pdev) | |||
669 | struct i2c_adapter *adap = i2c_pnx->adapter; | 669 | struct i2c_adapter *adap = i2c_pnx->adapter; |
670 | struct i2c_pnx_algo_data *alg_data = adap->algo_data; | 670 | struct i2c_pnx_algo_data *alg_data = adap->algo_data; |
671 | 671 | ||
672 | free_irq(alg_data->irq, alg_data); | 672 | free_irq(alg_data->irq, i2c_pnx->adapter); |
673 | i2c_del_adapter(adap); | 673 | i2c_del_adapter(adap); |
674 | i2c_pnx->set_clock_stop(pdev); | 674 | i2c_pnx->set_clock_stop(pdev); |
675 | iounmap((void *)alg_data->ioaddr); | 675 | iounmap((void *)alg_data->ioaddr); |