summaryrefslogtreecommitdiffstats
path: root/drivers/i2c
diff options
context:
space:
mode:
authorBen Gardner <gardner.ben@gmail.com>2006-07-01 17:22:18 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2006-07-12 15:43:07 -0700
commit50436a47c6b10c6e4e84e24ea44c5cb85bbcd290 (patch)
tree5271b0ec88589406debc578148f946da82f8aca4 /drivers/i2c
parent5313775f18f22f1dac2b548b598d47d65f90e6b0 (diff)
downloadop-kernel-dev-50436a47c6b10c6e4e84e24ea44c5cb85bbcd290.zip
op-kernel-dev-50436a47c6b10c6e4e84e24ea44c5cb85bbcd290.tar.gz
[PATCH] pca9539: Honor the force parameter
The pca9539 driver doesn't honor the force parameter; it always does detection. This patch will skip detection if forced. Signed-off-by: Ben Gardner <gardner.ben@gmail.com> Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/i2c')
-rw-r--r--drivers/i2c/chips/pca9539.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/i2c/chips/pca9539.c b/drivers/i2c/chips/pca9539.c
index 54b6e6a..cb22280 100644
--- a/drivers/i2c/chips/pca9539.c
+++ b/drivers/i2c/chips/pca9539.c
@@ -134,11 +134,13 @@ static int pca9539_detect(struct i2c_adapter *adapter, int address, int kind)
new_client->driver = &pca9539_driver;
new_client->flags = 0;
- /* Detection: the pca9539 only has 8 registers (0-7).
- A read of 7 should succeed, but a read of 8 should fail. */
- if ((i2c_smbus_read_byte_data(new_client, 7) < 0) ||
- (i2c_smbus_read_byte_data(new_client, 8) >= 0))
- goto exit_kfree;
+ if (kind < 0) {
+ /* Detection: the pca9539 only has 8 registers (0-7).
+ A read of 7 should succeed, but a read of 8 should fail. */
+ if ((i2c_smbus_read_byte_data(new_client, 7) < 0) ||
+ (i2c_smbus_read_byte_data(new_client, 8) >= 0))
+ goto exit_kfree;
+ }
strlcpy(new_client->name, "pca9539", I2C_NAME_SIZE);
OpenPOWER on IntegriCloud