]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
usb: typec-mux: nb7vpq904m: unregister typec switch on probe error and remove
authorNeil Armstrong <neil.armstrong@linaro.org>
Thu, 6 Jun 2024 13:11:14 +0000 (15:11 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 20 Jun 2024 17:32:13 +0000 (19:32 +0200)
Add the missing call to typec_switch_put() when probe fails and
the nb7vpq904m_remove() call is called.

Fixes: 348359e7c232 ("usb: typec: nb7vpq904m: Add an error handling path in nb7vpq904m_probe()")
Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
Fixes: 88d8f3ac9c67 ("usb: typec: add support for the nb7vpq904m Type-C Linear Redriver")
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Link: https://lore.kernel.org/r/20240606-topic-sm8x50-upstream-retimer-broadcast-mode-v2-2-c6f6eae479c3@linaro.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/typec/mux/nb7vpq904m.c

index ed93194b16cf1c7f82212d0f98546bd6c630ab3a..569f1162ee2e5873846f0616d7e1eb5f01257285 100644 (file)
@@ -415,7 +415,7 @@ static int nb7vpq904m_probe(struct i2c_client *client)
 
        ret = nb7vpq904m_parse_data_lanes_mapping(nb7);
        if (ret)
-               return ret;
+               goto err_switch_put;
 
        ret = regulator_enable(nb7->vcc_supply);
        if (ret)
@@ -458,6 +458,9 @@ err_disable_gpio:
        gpiod_set_value(nb7->enable_gpio, 0);
        regulator_disable(nb7->vcc_supply);
 
+err_switch_put:
+       typec_switch_put(nb7->typec_switch);
+
        return ret;
 }
 
@@ -471,6 +474,8 @@ static void nb7vpq904m_remove(struct i2c_client *client)
        gpiod_set_value(nb7->enable_gpio, 0);
 
        regulator_disable(nb7->vcc_supply);
+
+       typec_switch_put(nb7->typec_switch);
 }
 
 static const struct i2c_device_id nb7vpq904m_table[] = {