diff options
| author | Fabio Estevam <fabio.estevam@freescale.com> | 2013-12-05 15:20:49 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-12-09 13:14:12 -0800 |
| commit | cc5c9eb67f912cb2c349b04063ff9f444affbc59 (patch) | |
| tree | fa278fc3da3151f0eb29e9800482681a73475b30 /drivers/usb | |
| parent | 52d0dc7597c89b2ab779f3dcb9b9bf0800dd9218 (diff) | |
| download | linux-stable-cc5c9eb67f912cb2c349b04063ff9f444affbc59.tar.gz linux-stable-cc5c9eb67f912cb2c349b04063ff9f444affbc59.tar.bz2 linux-stable-cc5c9eb67f912cb2c349b04063ff9f444affbc59.zip | |
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.
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>
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/chipidea/host.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/chipidea/host.c b/drivers/usb/chipidea/host.c index 59e6020ea753..526cd77563d8 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); |