lkml.org 
[lkml]   [2020]   [Apr]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.6 123/166] mfd: cros_ec: Check DT node for usbpd-notify add
    Date
    From: Prashant Malani <pmalani@chromium.org>

    [ Upstream commit f8db89d14efb770dd59aa0ca74386e5de68310d5 ]

    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>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/mfd/cros_ec_dev.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/mfd/cros_ec_dev.c b/drivers/mfd/cros_ec_dev.c
    index 39e6116950536..32c2b912b58b2 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,
    --
    2.20.1


    \
     
     \ /
      Last update: 2020-04-22 12:32    [W:4.236 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site