From: Fabio Estevam <fabio.estevam@freescale.com>
Date: Fri, 8 Nov 2013 03:09:47 +0000 (-0200)
Subject: usb: chipidea: host: Only disable the vbus regulator if it is not NULL
X-Git-Tag: v3.14-rc1~148^2~130^2~64
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=46adcf3d82b44a4a9f147b2b898595d48873aa53;p=~emulex%2Finfiniband.git

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

Commit 40ed51a4b (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.

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/usb/chipidea/host.c b/drivers/usb/chipidea/host.c
index 59e6020ea75..526cd77563d 100644
--- a/drivers/usb/chipidea/host.c
+++ b/drivers/usb/chipidea/host.c
@@ -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);