Skip to content

Commit

Permalink
usb: typec-mux: nb7vpq904m: unregister typec switch on probe error an…
Browse files Browse the repository at this point in the history
…d remove

Add the missing call to typec_switch_put() when probe fails and
the nb7vpq904m_remove() call is called.

Fixes: 348359e ("usb: typec: nb7vpq904m: Add an error handling path in nb7vpq904m_probe()")
Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
Fixes: 88d8f3a ("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>
  • Loading branch information
superna9999 authored and gregkh committed Jun 20, 2024
1 parent 2be53b0 commit 74b64e7
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion drivers/usb/typec/mux/nb7vpq904m.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -458,6 +458,9 @@ static int nb7vpq904m_probe(struct i2c_client *client)
gpiod_set_value(nb7->enable_gpio, 0);
regulator_disable(nb7->vcc_supply);

err_switch_put:
typec_switch_put(nb7->typec_switch);

return ret;
}

Expand All @@ -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[] = {
Expand Down

0 comments on commit 74b64e7

Please sign in to comment.