Skip to content

Commit

Permalink
usb: chipidea: host: Only disable the vbus regulator if it is not NULL
Browse files Browse the repository at this point in the history
Commit 40ed51a (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: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Peter Chen <peter.chen@freescale.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Fabio Estevam authored and Greg Kroah-Hartman committed Dec 9, 2013
1 parent 52d0dc7 commit cc5c9eb
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion drivers/usb/chipidea/host.c
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,8 @@ static int host_start(struct ci_hdrc *ci)
return ret;

disable_reg:
regulator_disable(ci->platdata->reg_vbus);
if (ci->platdata->reg_vbus)
regulator_disable(ci->platdata->reg_vbus);

put_hcd:
usb_put_hcd(hcd);
Expand Down

0 comments on commit cc5c9eb

Please sign in to comment.