lkml.org 
[lkml]   [2022]   [Jun]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 270/452] platform/chrome: cros_ec: fix error handling in cros_ec_register()
    Date
    From: Tzung-Bi Shih <tzungbi@kernel.org>

    [ Upstream commit 2cd01bd6b117df07b1bc2852f08694fdd29e40ed ]

    Fix cros_ec_register() to unregister platform devices if
    blocking_notifier_chain_register() fails.

    Also use the single exit path to handle the platform device
    unregistration.

    Fixes: 42cd0ab476e2 ("platform/chrome: cros_ec: Query EC protocol version if EC transitions between RO/RW")
    Reviewed-by: Prashant Malani <pmalani@chromium.org>
    Signed-off-by: Tzung-Bi Shih <tzungbi@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/platform/chrome/cros_ec.c | 16 ++++++++++------
    1 file changed, 10 insertions(+), 6 deletions(-)

    diff --git a/drivers/platform/chrome/cros_ec.c b/drivers/platform/chrome/cros_ec.c
    index 3104680b7485..979f92194e81 100644
    --- a/drivers/platform/chrome/cros_ec.c
    +++ b/drivers/platform/chrome/cros_ec.c
    @@ -175,6 +175,8 @@ int cros_ec_register(struct cros_ec_device *ec_dev)
    ec_dev->max_request = sizeof(struct ec_params_hello);
    ec_dev->max_response = sizeof(struct ec_response_get_protocol_info);
    ec_dev->max_passthru = 0;
    + ec_dev->ec = NULL;
    + ec_dev->pd = NULL;

    ec_dev->din = devm_kzalloc(dev, ec_dev->din_size, GFP_KERNEL);
    if (!ec_dev->din)
    @@ -231,18 +233,16 @@ int cros_ec_register(struct cros_ec_device *ec_dev)
    if (IS_ERR(ec_dev->pd)) {
    dev_err(ec_dev->dev,
    "Failed to create CrOS PD platform device\n");
    - platform_device_unregister(ec_dev->ec);
    - return PTR_ERR(ec_dev->pd);
    + err = PTR_ERR(ec_dev->pd);
    + goto exit;
    }
    }

    if (IS_ENABLED(CONFIG_OF) && dev->of_node) {
    err = devm_of_platform_populate(dev);
    if (err) {
    - platform_device_unregister(ec_dev->pd);
    - platform_device_unregister(ec_dev->ec);
    dev_err(dev, "Failed to register sub-devices\n");
    - return err;
    + goto exit;
    }
    }

    @@ -264,12 +264,16 @@ int cros_ec_register(struct cros_ec_device *ec_dev)
    err = blocking_notifier_chain_register(&ec_dev->event_notifier,
    &ec_dev->notifier_ready);
    if (err)
    - return err;
    + goto exit;
    }

    dev_info(dev, "Chrome EC device registered\n");

    return 0;
    +exit:
    + platform_device_unregister(ec_dev->ec);
    + platform_device_unregister(ec_dev->pd);
    + return err;
    }
    EXPORT_SYMBOL(cros_ec_register);

    --
    2.35.1


    \
     
     \ /
      Last update: 2022-06-07 19:53    [W:2.666 / U:0.104 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site