Commit f8db89d1 authored by Prashant Malani's avatar Prashant Malani Committed by Lee Jones
Browse files

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: 4602dce0 ("mfd: cros_ec: Add cros-usbpd-notify subdevice")
Signed-off-by: default avatarPrashant Malani <pmalani@chromium.org>
Tested-by: default avatarEnric Balletbo i Serra <enric.balletbo@collabora.com>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent 873357b1

drivers/mfd/cros_ec_dev.c

+1 −1
Original line number Diff line number Diff line
@@ -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,