Commit cc5c9eb6 authored by Fabio Estevam's avatar Fabio Estevam Committed by Greg Kroah-Hartman

usb: chipidea: host: Only disable the vbus regulator if it is not NULL

Commit 40ed51a4 (usb: chipidea: host: add vbus regulator
control) introduced a smatch complaint because regulator_disable() is called
without checking whether ci->platdata->reg_vbus is not NULL.

Fix this by adding the check.

This patch is needed for 3.12 stable

Cc: stable <stable@vger.kernel.org>
Reported-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarFabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: default avatarPeter Chen <peter.chen@freescale.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 52d0dc75
...@@ -88,7 +88,8 @@ static int host_start(struct ci_hdrc *ci) ...@@ -88,7 +88,8 @@ static int host_start(struct ci_hdrc *ci)
return ret; return ret;
disable_reg: disable_reg:
regulator_disable(ci->platdata->reg_vbus); if (ci->platdata->reg_vbus)
regulator_disable(ci->platdata->reg_vbus);
put_hcd: put_hcd:
usb_put_hcd(hcd); usb_put_hcd(hcd);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment