From: Dongliang Mu <mudongliangabcd@xxxxxxxxx>
Smatch reports the following warning:
vers/usb/misc/usb3503.c:267 usb3503_probe() warn: 'hub->clk'
from clk_prepare_enable() not released on lines: 240,246,252
Fix this by adding a flag to indicate if hub->clk is prepared or not and
invoke clk_disable_unprepare in the error handling.
Signed-off-by: Dongliang Mu <mudongliangabcd@xxxxxxxxx>
---
drivers/usb/misc/usb3503.c | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/drivers/usb/misc/usb3503.c b/drivers/usb/misc/usb3503.c
index 330f494cd158..add47dd964b2 100644
--- a/drivers/usb/misc/usb3503.c
+++ b/drivers/usb/misc/usb3503.c
@@ -160,6 +160,7 @@ static int usb3503_probe(struct usb3503 *hub)
struct usb3503_platform_data *pdata = dev_get_platdata(dev);
struct device_node *np = dev->of_node;
int err;
+ int is_clk_enable = 0;
u32 mode = USB3503_MODE_HUB;
const u32 *property;
enum gpiod_flags flags;
@@ -217,6 +218,8 @@ static int usb3503_probe(struct usb3503 *hub)
return err;
}
+ // set a flag for successful clk_prepare_enable
+ is_clk_enable = 1;
property = of_get_property(np, "disabled-ports", &len);
if (property && (len / sizeof(u32)) > 0) {
int i;
@@ -236,20 +239,29 @@ static int usb3503_probe(struct usb3503 *hub)
else
flags = GPIOD_OUT_HIGH;
hub->intn = devm_gpiod_get_optional(dev, "intn", flags);
- if (IS_ERR(hub->intn))
+ if (IS_ERR(hub->intn)) {
+ if (is_clk_enable)
+ clk_disable_unprepare(hub->clk);
return PTR_ERR(hub->intn);
+ }
if (hub->intn)
gpiod_set_consumer_name(hub->intn, "usb3503 intn");
hub->connect = devm_gpiod_get_optional(dev, "connect", GPIOD_OUT_LOW);
- if (IS_ERR(hub->connect))
+ if (IS_ERR(hub->connect)) {
+ if (is_clk_enable)
+ clk_disable_unprepare(hub->clk);
return PTR_ERR(hub->connect);
+ }
if (hub->connect)
gpiod_set_consumer_name(hub->connect, "usb3503 connect");
hub->reset = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_HIGH);
- if (IS_ERR(hub->reset))
+ if (IS_ERR(hub->reset)) {
+ if (is_clk_enable)
+ clk_disable_unprepare(hub->clk);
return PTR_ERR(hub->reset);
+ }
if (hub->reset) {
/* Datasheet defines a hardware reset to be at least 100us */
usleep_range(100, 10000);
--
2.25.1
