diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-13 10:58:41 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-13 10:58:41 -0700 |
| commit | bdbdfdef5766c2a60185e946df242f1bc0d37c09 (patch) | |
| tree | 1dea71a3d6a176f481f14cf85c2c834a70435184 /drivers/hwmon/tmp421.c | |
| parent | 67002151403350b497c1efc8d36450974dfca023 (diff) | |
| parent | 0b77f766f3ef9875e2bb0035c9b89b4f9469b78d (diff) | |
| download | blackbird-op-linux-bdbdfdef5766c2a60185e946df242f1bc0d37c09.tar.gz blackbird-op-linux-bdbdfdef5766c2a60185e946df242f1bc0d37c09.zip | |
Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull hwmon fixes from Guenter Roeck:
"Some more low risk cleanup patches:
- Remove unnecessary pci_set_drvdata in k10temp driver from Jingoo Han
- Fix return values in several drivers from Sachin Kamat
- Remove redundant break in amc6821 driver from Sachin Kamat"
* tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
hwmon: (k10temp) remove unnecessary pci_set_drvdata()
hwmon: (tmp421) Fix return value
hwmon: (amc6821) Remove redundant break
hwmon: (amc6821) Fix return value
hwmon: (ibmaem) Fix return value
hwmon: (emc2103) Fix return value
Diffstat (limited to 'drivers/hwmon/tmp421.c')
| -rw-r--r-- | drivers/hwmon/tmp421.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hwmon/tmp421.c b/drivers/hwmon/tmp421.c index 964c1d688274..ae26b06fa819 100644 --- a/drivers/hwmon/tmp421.c +++ b/drivers/hwmon/tmp421.c @@ -210,7 +210,7 @@ static int tmp421_init_client(struct i2c_client *client) if (config < 0) { dev_err(&client->dev, "Could not read configuration register (%d)\n", config); - return -ENODEV; + return config; } config_orig = config; |
