Commit 82b20d8b authored by Magnus Damm's avatar Magnus Damm Committed by Paul Mundt
Browse files

i2c: i2c-sh_mobile irq rollback fix 



Update the i2c-sh_mobile driver to properly free
interrupts. The function sh_mobile_i2c_hook_irqs()
is fixed so module both unload and load are working
as expected.

Signed-off-by: default avatarMagnus Damm <damm@opensource.se>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 32dfab3c

drivers/i2c/busses/i2c-sh_mobile.c

+13 −10
Original line number Diff line number Diff line
@@ -497,32 +497,35 @@ static int sh_mobile_i2c_hook_irqs(struct platform_device *dev, int hook) 
{

	struct resource *res;

	int ret = -ENXIO;

	int q, m;

	int k = 0;

	int n = 0;

	int n, k = 0;



	while ((res = platform_get_resource(dev, IORESOURCE_IRQ, k))) {

		for (n = res->start; hook && n <= res->end; n++) {

			if (request_irq(n, sh_mobile_i2c_isr, IRQF_DISABLED,

					dev_name(&dev->dev), dev))

					dev_name(&dev->dev), dev)) {

				for (n--; n >= res->start; n--)

					free_irq(n, dev);



				goto rollback;

			}

		}

		k++;

	}



	if (hook)

		return k > 0 ? 0 : -ENOENT;



	k--;

	ret = 0;



 rollback:

	for (q = k; k >= 0; k--) {

		for (m = n; m >= res->start; m--)

			free_irq(m, dev);

	k--;



	while (k >= 0) {

		res = platform_get_resource(dev, IORESOURCE_IRQ, k);

		for (n = res->start; n <= res->end; n++)

			free_irq(n, dev);



		res = platform_get_resource(dev, IORESOURCE_IRQ, k - 1);

		m = res->end;

		k--;

	}



	return ret;