diff options
| author | Prashant Malani <pmalani@chromium.org> | 2020-02-10 11:06:24 -0800 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2020-03-30 07:34:56 +0100 |
| commit | f8db89d14efb770dd59aa0ca74386e5de68310d5 (patch) | |
| tree | 471d3767b7204f18e460a1cfbab445f73467f108 /drivers/mfd/cros_ec_dev.c | |
| parent | 873357b1a7f044888be0a1dc6a753376cd2140eb (diff) | |
mfd: cros_ec: Check DT node for usbpd-notify add
Add a check to ensure there is indeed an EC device tree entry before
adding the cros-usbpd-notify device. This covers configs where both
CONFIG_ACPI and CONFIG_OF are defined, but the EC device is defined
using device tree and not in ACPI.
Fixes: 4602dce0361e ("mfd: cros_ec: Add cros-usbpd-notify subdevice")
Signed-off-by: Prashant Malani <pmalani@chromium.org>
Tested-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers/mfd/cros_ec_dev.c')
| -rw-r--r-- | drivers/mfd/cros_ec_dev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mfd/cros_ec_dev.c b/drivers/mfd/cros_ec_dev.c index 39e611695053..32c2b912b58b 100644 --- a/drivers/mfd/cros_ec_dev.c +++ b/drivers/mfd/cros_ec_dev.c @@ -211,7 +211,7 @@ static int ec_device_probe(struct platform_device *pdev) * explicitly added on platforms that don't have the PD notifier ACPI * device entry defined. */ - if (IS_ENABLED(CONFIG_OF)) { + if (IS_ENABLED(CONFIG_OF) && ec->ec_dev->dev->of_node) { if (cros_ec_check_features(ec, EC_FEATURE_USB_PD)) { retval = mfd_add_hotplug_devices(ec->dev, cros_usbpd_notify_cells, |