diff options
| author | Jonas Aaberg <jonas.aberg@stericsson.com> | 2011-11-22 10:53:41 +0100 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-05-22 11:01:14 +0200 |
| commit | eae204c3822fdd41221fdbe3b08feba120a1aed7 (patch) | |
| tree | 0289c748a8e66409bb242a38570f14ee48a599a3 /drivers | |
| parent | 296369d9b4c1d3b5682675ef7dc353819ae4eaac (diff) | |
misc: bh1780gli: Fix some obvious short commings
Unbalanced regulator handling on error during probe
and msleep on times less than 10 ms.
ST-Ericsson Linux next: -
ST-Ericsson ID: 370799
ST-Ericsson FOSS-OUT ID: Trivial
Change-Id: Ic1080bf38a2f1e1922ec015b305b5a2de3b30f0e
Signed-off-by: Jonas Aaberg <jonas.aberg@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/39196
Reviewed-by: Bengt JONSSON <bengt.g.jonsson@stericsson.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/misc/bh1780gli.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/misc/bh1780gli.c b/drivers/misc/bh1780gli.c index 7eb13d1085c..1035cb37695 100644 --- a/drivers/misc/bh1780gli.c +++ b/drivers/misc/bh1780gli.c @@ -146,7 +146,7 @@ static ssize_t bh1780_store_power_state(struct device *dev, if (val == BH1780_POFF) regulator_disable(ddata->regulator); - msleep(BH1780_PON_DELAY); + mdelay(BH1780_PON_DELAY); ddata->power_state = val; mutex_unlock(&ddata->lock); @@ -202,7 +202,7 @@ static int __devinit bh1780_probe(struct i2c_client *client, ret = bh1780_read(ddata, BH1780_REG_PARTID, "PART ID"); if (ret < 0) { dev_err(&client->dev, "failed to read part ID\n"); - goto put_regulator; + goto disable_regulator; } #ifdef CONFIG_HAS_EARLYSUSPEND ddata->early_suspend.level = EARLY_SUSPEND_LEVEL_BLANK_SCREEN + 1; @@ -220,13 +220,15 @@ static int __devinit bh1780_probe(struct i2c_client *client, mutex_init(&ddata->lock); ret = sysfs_create_group(&client->dev.kobj, &bh1780_attr_group); - if (ret) + if (ret) { + dev_err(&client->dev, "failed to create sysfs group\n"); goto put_regulator; + } return 0; - -put_regulator: +disable_regulator: regulator_disable(ddata->regulator); +put_regulator: regulator_put(ddata->regulator); free_ddata: kfree(ddata); |