diff options
author | Jean Delvare <khali@linux-fr.org> | 2005-07-31 15:42:02 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-09-05 12:14:20 -0400 |
commit | 2ed2dc3c116d26fc6a9384e83d136b15cc203b6c (patch) | |
tree | c79308b2cfe55eaddc95c47cbcafa6e0cae27413 /drivers/hwmon/adm1025.c | |
parent | b78ec31582c60578ee1d3bb470791d6dde96ccf7 (diff) |
[PATCH] hwmon: hwmon vs i2c, second round (04/11)
i2c_probe and i2c_detect now do the exact same thing and operate on
the same data structure, so we can have everyone call i2c_probe.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/hwmon/adm1025.c')
-rw-r--r-- | drivers/hwmon/adm1025.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hwmon/adm1025.c b/drivers/hwmon/adm1025.c index 181dadf42002..5b21284df2f8 100644 --- a/drivers/hwmon/adm1025.c +++ b/drivers/hwmon/adm1025.c | |||
@@ -314,7 +314,7 @@ static int adm1025_attach_adapter(struct i2c_adapter *adapter) | |||
314 | { | 314 | { |
315 | if (!(adapter->class & I2C_CLASS_HWMON)) | 315 | if (!(adapter->class & I2C_CLASS_HWMON)) |
316 | return 0; | 316 | return 0; |
317 | return i2c_detect(adapter, &addr_data, adm1025_detect); | 317 | return i2c_probe(adapter, &addr_data, adm1025_detect); |
318 | } | 318 | } |
319 | 319 | ||
320 | /* | 320 | /* |