Merge tag 'chrome-platform-for-linus-4.13' of git://git.kernel.org/pub/scm/linux...

[linux] / drivers / mfd / cros_ec.c

diff --git a/drivers/mfd/cros_ec.c b/drivers/mfd/cros_ec.c
index fc2569f..b0ca5a4 100644 (file)
--- a/drivers/mfd/cros_ec.c
+++ b/drivers/mfd/cros_ec.c
@@ -154,7 +154,7 @@ int cros_ec_register(struct cros_ec_device *ec_dev)
        }
 
        if (IS_ENABLED(CONFIG_OF) && dev->of_node) {
-               err = of_platform_populate(dev->of_node, NULL, NULL, dev);
+               err = devm_of_platform_populate(dev);
                if (err) {
                        mfd_remove_devices(dev);
                        dev_err(dev, "Failed to register sub-devices\n");
@@ -190,6 +190,9 @@ int cros_ec_remove(struct cros_ec_device *ec_dev)
 
        cros_ec_acpi_remove_gpe_handler();
 
+       if (ec_dev->irq)
+               free_irq(ec_dev->irq, ec_dev);
+
        return 0;
 }
 EXPORT_SYMBOL(cros_ec_remove);