diff options
author | Paul Mundt <lethal@linux-sh.org> | 2010-11-18 03:35:56 -0500 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2010-11-18 03:35:56 -0500 |
commit | 0421860a5a75b59a76b7a864a172eb090e3d0785 (patch) | |
tree | df22f28abfa4c8bb77d650b674a44e0aedc586be /drivers/hwmon/ad7414.c | |
parent | cf655c36fad7b6488a56f18ab56f7d608ca6552b (diff) | |
parent | 89ba4d12fca24d373e1b10fce498d68157bafaf0 (diff) |
Merge branch 'rmobile/ag5' into rmobile-latest
Diffstat (limited to 'drivers/hwmon/ad7414.c')
-rw-r--r-- | drivers/hwmon/ad7414.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/hwmon/ad7414.c b/drivers/hwmon/ad7414.c index 1e4c21fc1a89..86d822aa9bbf 100644 --- a/drivers/hwmon/ad7414.c +++ b/drivers/hwmon/ad7414.c | |||
@@ -178,11 +178,13 @@ static int ad7414_probe(struct i2c_client *client, | |||
178 | { | 178 | { |
179 | struct ad7414_data *data; | 179 | struct ad7414_data *data; |
180 | int conf; | 180 | int conf; |
181 | int err = 0; | 181 | int err; |
182 | 182 | ||
183 | if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_BYTE_DATA | | 183 | if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_BYTE_DATA | |
184 | I2C_FUNC_SMBUS_READ_WORD_DATA)) | 184 | I2C_FUNC_SMBUS_READ_WORD_DATA)) { |
185 | err = -EOPNOTSUPP; | ||
185 | goto exit; | 186 | goto exit; |
187 | } | ||
186 | 188 | ||
187 | data = kzalloc(sizeof(struct ad7414_data), GFP_KERNEL); | 189 | data = kzalloc(sizeof(struct ad7414_data), GFP_KERNEL); |
188 | if (!data) { | 190 | if (!data) { |