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

Commit eb3f2f23 authored by Vincent Palatin's avatar Vincent Palatin Committed by Lee Jones
Browse files

mfd: cros_ec: Free IRQ automatically 



Free the IRQ we might have requested when removing the cros_ec device,
so we can unload and reload the driver properly.

Signed-off-by: default avatarVincent Palatin <vpalatin@chromium.org>
Signed-off-by: default avatarEnric Balletbo i Serra <enric.balletbo@collabora.com>
Acked-by: default avatarVincent Palatin <vpalatin@chromium.org>
Reviewed-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent 0dbbf255

drivers/mfd/cros_ec.c

+6 −14
Original line number Diff line number Diff line
@@ -119,8 +119,8 @@ int cros_ec_register(struct cros_ec_device *ec_dev) 
	}



	if (ec_dev->irq) {

		err = request_threaded_irq(ec_dev->irq, NULL, ec_irq_thread,

					   IRQF_TRIGGER_LOW | IRQF_ONESHOT,

		err = devm_request_threaded_irq(dev, ec_dev->irq, NULL,

				ec_irq_thread, IRQF_TRIGGER_LOW | IRQF_ONESHOT,

				"chromeos-ec", ec_dev);

		if (err) {

			dev_err(dev, "Failed to request IRQ %d: %d",
@@ -135,7 +135,7 @@ int cros_ec_register(struct cros_ec_device *ec_dev) 
		dev_err(dev,

			"Failed to register Embedded Controller subdevice %d\n",

			err);

		goto fail_mfd;

		return err;

	}



	if (ec_dev->max_passthru) {
@@ -153,7 +153,7 @@ int cros_ec_register(struct cros_ec_device *ec_dev) 
			dev_err(dev,

				"Failed to register Power Delivery subdevice %d\n",

				err);

			goto fail_mfd;

			return err;

		}

	}
@@ -162,7 +162,7 @@ int cros_ec_register(struct cros_ec_device *ec_dev) 
		if (err) {

			mfd_remove_devices(dev);

			dev_err(dev, "Failed to register sub-devices\n");

			goto fail_mfd;

			return err;

		}

	}
@@ -178,11 +178,6 @@ int cros_ec_register(struct cros_ec_device *ec_dev) 
	dev_info(dev, "Chrome EC device registered\n");



	return 0;



fail_mfd:

	if (ec_dev->irq)

		free_irq(ec_dev->irq, ec_dev);

	return err;

}

EXPORT_SYMBOL(cros_ec_register);
@@ -190,9 +185,6 @@ int cros_ec_remove(struct cros_ec_device *ec_dev) 
{

	mfd_remove_devices(ec_dev->dev);



	if (ec_dev->irq)

		free_irq(ec_dev->irq, ec_dev);



	return 0;

}

EXPORT_SYMBOL(cros_ec_remove);