Commit cc5c9eb6 authored Dec 05, 2013 by Fabio Estevam Committed by Greg Kroah-Hartman Dec 09, 2013

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: 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>

parent 52d0dc75

drivers/usb/chipidea/host.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -88,6 +88,7 @@ static int host_start(struct ci_hdrc *ci)
		return ret;

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

		put_hcd: