Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f8d5e5a8 authored by Russell King's avatar Russell King
Browse files

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: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
Acked-by: default avatarBen Dooks <ben-linux@fluff.org>
parent 1508c995

drivers/i2c/busses/i2c-pnx.c

+2 −2
Original line number Diff line number Diff line
@@ -650,7 +650,7 @@ static int __devinit i2c_pnx_probe(struct platform_device *pdev) 
	return 0;



out_irq:

	free_irq(alg_data->irq, alg_data);

	free_irq(alg_data->irq, i2c_pnx->adapter);

out_clock:

	i2c_pnx->set_clock_stop(pdev);

out_unmap:
@@ -669,7 +669,7 @@ static int __devexit i2c_pnx_remove(struct platform_device *pdev) 
	struct i2c_adapter *adap = i2c_pnx->adapter;

	struct i2c_pnx_algo_data *alg_data = adap->algo_data;



	free_irq(alg_data->irq, alg_data);

	free_irq(alg_data->irq, i2c_pnx->adapter);

	i2c_del_adapter(adap);

	i2c_pnx->set_clock_stop(pdev);

	iounmap((void *)alg_data->ioaddr);