diff options
| author | Tony Lindgren <tony@atomide.com> | 2020-06-16 18:25:03 +0200 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2020-06-16 18:25:03 +0200 |
| commit | 07c7b547a79605f1041d55b84d91a4a4d9c5b363 (patch) | |
| tree | d98c1adacc8c65b475c325b427e54b8205b0013d /drivers/hwmon/lm75.c | |
| parent | Revert "bus: ti-sysc: Increase max softreset wait" (diff) | |
| parent | Linux 5.8-rc1 (diff) | |
| download | linux-07c7b547a79605f1041d55b84d91a4a4d9c5b363.tar.xz linux-07c7b547a79605f1041d55b84d91a4a4d9c5b363.zip | |
Merge tag 'v5.8-rc1' into fixes
Linux 5.8-rc1
Diffstat (limited to 'drivers/hwmon/lm75.c')
| -rw-r--r-- | drivers/hwmon/lm75.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/hwmon/lm75.c b/drivers/hwmon/lm75.c index 5e6392294c03..ba0be48aeadd 100644 --- a/drivers/hwmon/lm75.c +++ b/drivers/hwmon/lm75.c @@ -797,8 +797,10 @@ static int lm75_detect(struct i2c_client *new_client, /* First check for LM75A */ if (i2c_smbus_read_byte_data(new_client, 7) == LM75A_ID) { - /* LM75A returns 0xff on unused registers so - just to be sure we check for that too. */ + /* + * LM75A returns 0xff on unused registers so + * just to be sure we check for that too. + */ if (i2c_smbus_read_byte_data(new_client, 4) != 0xff || i2c_smbus_read_byte_data(new_client, 5) != 0xff || i2c_smbus_read_byte_data(new_client, 6) != 0xff) @@ -849,6 +851,7 @@ static int lm75_suspend(struct device *dev) { int status; struct i2c_client *client = to_i2c_client(dev); + status = i2c_smbus_read_byte_data(client, LM75_REG_CONF); if (status < 0) { dev_dbg(&client->dev, "Can't read config? %d\n", status); @@ -863,6 +866,7 @@ static int lm75_resume(struct device *dev) { int status; struct i2c_client *client = to_i2c_client(dev); + status = i2c_smbus_read_byte_data(client, LM75_REG_CONF); if (status < 0) { dev_dbg(&client->dev, "Can't read config? %d\n", status); |