From: Bill Richardson <wfric...@chromium.org> Preparing the way for the LPC device, which is just a plaform_device without interrupts.
Signed-off-by: Bill Richardson <wfric...@chromium.org> Signed-off-by: Doug Anderson <diand...@chromium.org> --- drivers/mfd/cros_ec.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/drivers/mfd/cros_ec.c b/drivers/mfd/cros_ec.c index 38fe9bf..bd6f936 100644 --- a/drivers/mfd/cros_ec.c +++ b/drivers/mfd/cros_ec.c @@ -119,17 +119,15 @@ int cros_ec_register(struct cros_ec_device *ec_dev) return -ENOMEM; } - if (!ec_dev->irq) { - dev_dbg(dev, "no valid IRQ: %d\n", ec_dev->irq); - return err; - } - - err = request_threaded_irq(ec_dev->irq, NULL, ec_irq_thread, - IRQF_TRIGGER_LOW | IRQF_ONESHOT, - "chromeos-ec", ec_dev); - if (err) { - dev_err(dev, "request irq %d: error %d\n", ec_dev->irq, err); - return err; + if (ec_dev->irq) { + err = request_threaded_irq(ec_dev->irq, NULL, ec_irq_thread, + IRQF_TRIGGER_LOW | IRQF_ONESHOT, + "chromeos-ec", ec_dev); + if (err) { + dev_err(dev, "request irq %d: error %d\n", + ec_dev->irq, err); + return err; + } } err = mfd_add_devices(dev, 0, cros_devs, @@ -145,7 +143,8 @@ int cros_ec_register(struct cros_ec_device *ec_dev) return 0; fail_mfd: - free_irq(ec_dev->irq, ec_dev); + if (ec_dev->irq) + free_irq(ec_dev->irq, ec_dev); return err; } @@ -154,7 +153,8 @@ EXPORT_SYMBOL(cros_ec_register); int cros_ec_remove(struct cros_ec_device *ec_dev) { mfd_remove_devices(ec_dev->dev); - free_irq(ec_dev->irq, ec_dev); + if (ec_dev->irq) + free_irq(ec_dev->irq, ec_dev); return 0; } -- 2.0.0.526.g5318336 -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html