diff options
| author | Arun Murthy <arun.murthy@stericsson.com> | 2010-05-10 16:46:16 +0530 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2010-09-02 22:45:28 -0600 |
| commit | 4d9e20a6502e97633d95f209dbbad82be753b436 (patch) | |
| tree | e7c653080fd88284ddeeff771426e9182dac1c78 | |
| parent | cc3abe7233a7bda351ad226d3ee8a30d37d372ea (diff) | |
WP:239161 Fix for suspend/resume in Accelerometer and Magnetometer
Signed-off-by: Arun Murthy <arun.murthy@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/206
Reviewed-by: Mian Yousaf KAUKAB <mian.yousaf.kaukab@stericsson.com>
Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
Tested-by: Jonas ABERG <jonas.aberg@stericsson.com>
Signed-off-by: Mian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com>
Change-Id: I4483ba38561e86ea41fe217d48c82ff3e465434e
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/2366
| -rwxr-xr-x | drivers/hwmon/lsm303dlh_a.c | 4 | ||||
| -rwxr-xr-x | drivers/hwmon/lsm303dlh_m.c | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/drivers/hwmon/lsm303dlh_a.c b/drivers/hwmon/lsm303dlh_a.c index 33169492056..a78706e647e 100755 --- a/drivers/hwmon/lsm303dlh_a.c +++ b/drivers/hwmon/lsm303dlh_a.c @@ -580,8 +580,10 @@ static int lsm303dlh_a_probe(struct i2c_client *client, goto exit_kfree; } - if (i2c_smbus_read_byte(client) < 0) { + err = i2c_smbus_read_byte(client); + if (err < 0) { dev_err(&client->dev, "i2c_smbus_read_byte error!!\n"); + err = -ENOMEM; goto exit_kfree; } else { dev_info(&client->dev, "lsm303dlh_a Device detected!\n"); diff --git a/drivers/hwmon/lsm303dlh_m.c b/drivers/hwmon/lsm303dlh_m.c index 340ecda2960..88ede7b923b 100755 --- a/drivers/hwmon/lsm303dlh_m.c +++ b/drivers/hwmon/lsm303dlh_m.c @@ -495,8 +495,10 @@ int lsm303dlh_m_probe(struct i2c_client *client, goto exit_kfree; } - if (i2c_smbus_read_byte(client) < 0) { + err = i2c_smbus_read_byte(client); + if (err < 0) { dev_err(&client->dev, "i2c_smbus_read_byte error!!\n"); + err = -ENODEV; goto exit_kfree; } else { dev_info(&client->dev, "LSM303DLH_M Device detected!\n"); @@ -508,6 +510,7 @@ int lsm303dlh_m_probe(struct i2c_client *client, dev_info(&client->dev, "I2C driver registered!\n"); } else { ldata->client = NULL; + err = -EINVAL; goto exit_kfree; } |