diff options
| author | srinidhi kasagar <srinidhi.kasagar@stericsson.com> | 2012-01-12 17:50:01 +0530 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-05-22 11:06:12 +0200 |
| commit | ba644aea2dd062c6ce7fab6a0a2e825ed3bc1f6e (patch) | |
| tree | d771516ed15f1099794e808d76b182a262014c00 /drivers/hwmon/lsm303dlh_m.c | |
| parent | 654b71a446e238a8fb1c80749ed083f9b4d74e82 (diff) | |
hwmon: l3g4200,lsm303x: fix up the error handling
handle the errors properly.
ST-Ericsson ID: 370799
ST-Ericsson FOSS-OUT ID: Trivial
ST-Ericsson Linux next: N/A
Signed-off-by: srinidhi kasagar <srinidhi.kasagar@stericsson.com>
Change-Id: I74d3f2e159bba9847fc4aab6287d23d38fb722e8
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/45272
Reviewed-by: QATOOLS
Reviewed-by: Naga RADHESH Y <naga.radheshy@stericsson.com>
Reviewed-by: QABUILD
Diffstat (limited to 'drivers/hwmon/lsm303dlh_m.c')
| -rw-r--r-- | drivers/hwmon/lsm303dlh_m.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/hwmon/lsm303dlh_m.c b/drivers/hwmon/lsm303dlh_m.c index 11815e3470f..270e532f78b 100644 --- a/drivers/hwmon/lsm303dlh_m.c +++ b/drivers/hwmon/lsm303dlh_m.c @@ -671,8 +671,9 @@ static int __devinit lsm303dlh_m_probe(struct i2c_client *client, ddata = kzalloc(sizeof(struct lsm303dlh_m_data), GFP_KERNEL); if (ddata == NULL) { + dev_err(&client->dev, "memory alocation failed\n"); ret = -ENOMEM; - goto err_op_failed; + goto err_alloc; } ddata->client = client; @@ -691,12 +692,13 @@ static int __devinit lsm303dlh_m_probe(struct i2c_client *client, ddata->gain[ddata->pdata.axis_map_z] = Z_GAIN_1_3; ddata->device_status = DEVICE_OFF; dev_set_name(&client->dev, ddata->pdata.name_m); - ddata->regulator = regulator_get(&client->dev, "vdd"); + ddata->regulator = regulator_get(&client->dev, "vdd"); if (IS_ERR(ddata->regulator)) { dev_err(&client->dev, "failed to get regulator\n"); ret = PTR_ERR(ddata->regulator); ddata->regulator = NULL; + goto err_op_failed; } if (ddata->regulator) { @@ -790,9 +792,11 @@ exit_free_regulator: regulator_put(ddata->regulator); ddata->device_status = DEVICE_OFF; } + err_op_failed: - dev_err(&client->dev, "lsm303dlh_m_probe failed %x", ret); kfree(ddata); +err_alloc: + dev_err(&client->dev, "lsm303dlh_m_probe failed %x", ret); return ret; } |