diff --git a/[refs] b/[refs] index d9edc8ee2ab3..8eb5264f9a6a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cad877ef0af8d18aae88bb7d0f30f747f003fd0f +refs/heads/master: 240a529108a11d235328a140fe6b03cf76cef099 diff --git a/trunk/drivers/regulator/lp8755.c b/trunk/drivers/regulator/lp8755.c index decb3adbf04a..8c3f3f2094c6 100644 --- a/trunk/drivers/regulator/lp8755.c +++ b/trunk/drivers/regulator/lp8755.c @@ -497,35 +497,36 @@ static int lp8755_probe(struct i2c_client *client, if (!pchip->pdata) return -ENOMEM; ret = lp8755_init_data(pchip); - if (ret < 0) - goto err_chip_init; + if (ret < 0) { + dev_err(&client->dev, "fail to initialize chip\n"); + return ret; + } } ret = lp8755_regulator_init(pchip); - if (ret < 0) + if (ret < 0) { + dev_err(&client->dev, "fail to initialize regulators\n"); goto err_regulator; + } pchip->irq = client->irq; ret = lp8755_int_config(pchip); - if (ret < 0) + if (ret < 0) { + dev_err(&client->dev, "fail to irq config\n"); goto err_irq; + } return ret; err_irq: - dev_err(&client->dev, "fail to irq config\n"); - for (icnt = 0; icnt < mphase_buck[pchip->mphase].nreg; icnt++) regulator_unregister(pchip->rdev[icnt]); err_regulator: - dev_err(&client->dev, "fail to initialize regulators\n"); /* output disable */ for (icnt = 0; icnt < 0x06; icnt++) lp8755_write(pchip, icnt, 0x00); -err_chip_init: - dev_err(&client->dev, "fail to initialize chip\n"); return ret; }