From 0295088d53cd605aaf2a2accfd65c19c0f8a0cf0 Mon Sep 17 00:00:00 2001 From: David Jander Date: Thu, 7 Jan 2016 10:55:00 +0100 Subject: usb: chipidea-imx: check return value of regulator_get() The VBUS regulator is optional for the chipidea-imx glue, so it must be checked if regulator_get provided a valid regulator handle before trying to enable the regulator. Signed-off-by: David Jander Signed-off-by: Lucas Stach Signed-off-by: Sascha Hauer --- drivers/usb/imx/chipidea-imx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/usb/imx/chipidea-imx.c b/drivers/usb/imx/chipidea-imx.c index ae307183bc..a1c36cf644 100644 --- a/drivers/usb/imx/chipidea-imx.c +++ b/drivers/usb/imx/chipidea-imx.c @@ -242,7 +242,8 @@ static int imx_chipidea_probe(struct device_d *dev) ci->vbus = regulator_get(dev, "vbus"); - regulator_enable(ci->vbus); + if (!IS_ERR(ci->vbus)) + regulator_enable(ci->vbus); base = dev_request_mem_region(dev, 0); if (IS_ERR(base)) -- cgit v1.2.3