tmakin/tegra-linux-noble
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

usb: typec-mux: ptn36502: unregister typec switch on probe error and remove

Browse Source 
BugLink: https://bugs.launchpad.net/bugs/2083196

[ Upstream commit 2be53b0436fda455e1bf6968ebae53f5d4f3cb0b ]

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

Fixes: 8e99dc7836 ("usb: typec: add support for PTN36502 redriver")
Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://lore.kernel.org/r/20240606-topic-sm8x50-upstream-retimer-broadcast-mode-v2-1-c6f6eae479c3@linaro.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Portia Stephens <portia.stephens@canonical.com>
Signed-off-by: Roxana Nicolescu <roxana.nicolescu@canonical.com>
This commit is contained in:
Neil Armstrong
2024-06-06 15:11:13 +02:00
committed by Mehmet Basaran
parent ad461b0a9c
commit 5dcbbb0881
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/usb/typec/mux/ptn36502.c
+9 -2
View File
@@ -362,8 +362,10 @@ static int ptn36502_probe(struct i2c_client *client)
"Failed to acquire orientation-switch\n");
ret = regulator_enable(ptn->vdd18_supply);
if (ret)
return dev_err_probe(dev, ret, "Failed to enable vdd18\n");
if (ret) {
ret = dev_err_probe(dev, ret, "Failed to enable vdd18\n");
goto err_switch_put;
}
ret = ptn36502_detect(ptn);
if (ret)
@@ -403,6 +405,9 @@ err_switch_unregister:
err_disable_regulator:
regulator_disable(ptn->vdd18_supply);
err_switch_put:
typec_switch_put(ptn->typec_switch);
return ret;
}
@@ -414,6 +419,8 @@ static void ptn36502_remove(struct i2c_client *client)
typec_switch_unregister(ptn->sw);
regulator_disable(ptn->vdd18_supply);
typec_switch_put(ptn->typec_switch);
}
static const struct i2c_device_id ptn36502_table[] = {