redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

usb: phy: phy-generic: Check clk_prepare_enable() error

Browse source 
clk_prepare_enable() may fail, so we should better check its return
value and propagate it in the case of failure.

Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
This commit is contained in:
Fabio Estevam 2016-08-22 22:45:36 -03:00 committed by Felipe Balbi
parent b2f1eaaee5
commit 7c113f7df7
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/usb/phy/phy-generic.c
View file

@ -144,14 +144,18 @@ static irqreturn_t nop_gpio_vbus_thread(int irq, void *data)
int usb_gen_phy_init(struct usb_phy *phy) int usb_gen_phy_init(struct usb_phy *phy)
{ {
struct usb_phy_generic *nop = dev_get_drvdata(phy->dev); struct usb_phy_generic *nop = dev_get_drvdata(phy->dev);
int ret;
if (!IS_ERR(nop->vcc)) { if (!IS_ERR(nop->vcc)) {
if (regulator_enable(nop->vcc)) if (regulator_enable(nop->vcc))
dev_err(phy->dev, "Failed to enable power\n"); dev_err(phy->dev, "Failed to enable power\n");
} }
if (!IS_ERR(nop->clk)) if (!IS_ERR(nop->clk)) {
clk_prepare_enable(nop->clk); ret = clk_prepare_enable(nop->clk);
if (ret)
return ret;
}
nop_reset(nop); nop_reset(nop);