cc5c9eb67f
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>
140 lines
3.0 KiB
C
140 lines
3.0 KiB
C
/*
|
|
* host.c - ChipIdea USB host controller driver
|
|
*
|
|
* Copyright (c) 2012 Intel Corporation
|
|
*
|
|
* Author: Alexander Shishkin
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
*/
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/io.h>
|
|
#include <linux/usb.h>
|
|
#include <linux/usb/hcd.h>
|
|
#include <linux/usb/chipidea.h>
|
|
#include <linux/regulator/consumer.h>
|
|
|
|
#include "../host/ehci.h"
|
|
|
|
#include "ci.h"
|
|
#include "bits.h"
|
|
#include "host.h"
|
|
|
|
static struct hc_driver __read_mostly ci_ehci_hc_driver;
|
|
|
|
static irqreturn_t host_irq(struct ci_hdrc *ci)
|
|
{
|
|
return usb_hcd_irq(ci->irq, ci->hcd);
|
|
}
|
|
|
|
static int host_start(struct ci_hdrc *ci)
|
|
{
|
|
struct usb_hcd *hcd;
|
|
struct ehci_hcd *ehci;
|
|
int ret;
|
|
|
|
if (usb_disabled())
|
|
return -ENODEV;
|
|
|
|
hcd = usb_create_hcd(&ci_ehci_hc_driver, ci->dev, dev_name(ci->dev));
|
|
if (!hcd)
|
|
return -ENOMEM;
|
|
|
|
dev_set_drvdata(ci->dev, ci);
|
|
hcd->rsrc_start = ci->hw_bank.phys;
|
|
hcd->rsrc_len = ci->hw_bank.size;
|
|
hcd->regs = ci->hw_bank.abs;
|
|
hcd->has_tt = 1;
|
|
|
|
hcd->power_budget = ci->platdata->power_budget;
|
|
hcd->phy = ci->transceiver;
|
|
|
|
ehci = hcd_to_ehci(hcd);
|
|
ehci->caps = ci->hw_bank.cap;
|
|
ehci->has_hostpc = ci->hw_bank.lpm;
|
|
ehci->has_tdi_phy_lpm = ci->hw_bank.lpm;
|
|
|
|
if (ci->platdata->reg_vbus) {
|
|
ret = regulator_enable(ci->platdata->reg_vbus);
|
|
if (ret) {
|
|
dev_err(ci->dev,
|
|
"Failed to enable vbus regulator, ret=%d\n",
|
|
ret);
|
|
goto put_hcd;
|
|
}
|
|
}
|
|
|
|
ret = usb_add_hcd(hcd, 0, 0);
|
|
if (ret)
|
|
goto disable_reg;
|
|
else
|
|
ci->hcd = hcd;
|
|
|
|
if (ci->platdata->flags & CI_HDRC_DISABLE_STREAMING)
|
|
hw_write(ci, OP_USBMODE, USBMODE_CI_SDIS, USBMODE_CI_SDIS);
|
|
|
|
return ret;
|
|
|
|
disable_reg:
|
|
if (ci->platdata->reg_vbus)
|
|
regulator_disable(ci->platdata->reg_vbus);
|
|
|
|
put_hcd:
|
|
usb_put_hcd(hcd);
|
|
|
|
return ret;
|
|
}
|
|
|
|
static void host_stop(struct ci_hdrc *ci)
|
|
{
|
|
struct usb_hcd *hcd = ci->hcd;
|
|
|
|
if (hcd) {
|
|
usb_remove_hcd(hcd);
|
|
usb_put_hcd(hcd);
|
|
if (ci->platdata->reg_vbus)
|
|
regulator_disable(ci->platdata->reg_vbus);
|
|
}
|
|
}
|
|
|
|
|
|
void ci_hdrc_host_destroy(struct ci_hdrc *ci)
|
|
{
|
|
if (ci->role == CI_ROLE_HOST && ci->hcd)
|
|
host_stop(ci);
|
|
}
|
|
|
|
int ci_hdrc_host_init(struct ci_hdrc *ci)
|
|
{
|
|
struct ci_role_driver *rdrv;
|
|
|
|
if (!hw_read(ci, CAP_DCCPARAMS, DCCPARAMS_HC))
|
|
return -ENXIO;
|
|
|
|
rdrv = devm_kzalloc(ci->dev, sizeof(struct ci_role_driver), GFP_KERNEL);
|
|
if (!rdrv)
|
|
return -ENOMEM;
|
|
|
|
rdrv->start = host_start;
|
|
rdrv->stop = host_stop;
|
|
rdrv->irq = host_irq;
|
|
rdrv->name = "host";
|
|
ci->roles[CI_ROLE_HOST] = rdrv;
|
|
|
|
ehci_init_driver(&ci_ehci_hc_driver, NULL);
|
|
|
|
return 0;
|
|
}
|