git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt...
[pandora-kernel.git]
/
drivers
/
i2c
/
muxes
/
pca954x.c
diff --git
a/drivers/i2c/muxes/pca954x.c
b/drivers/i2c/muxes/pca954x.c
index
54e1ce7
..
6f89536
100644
(file)
--- a/
drivers/i2c/muxes/pca954x.c
+++ b/
drivers/i2c/muxes/pca954x.c
@@
-201,10
+201,11
@@
static int pca954x_probe(struct i2c_client *client,
i2c_set_clientdata(client, data);
i2c_set_clientdata(client, data);
- /* Read the mux register at addr to verify
- * that the mux is in fact present.
+ /* Write the mux register at addr to verify
+ * that the mux is in fact present. This also
+ * initializes the mux to disconnected state.
*/
*/
- if (i2c_smbus_
read_byte(client
) < 0) {
+ if (i2c_smbus_
write_byte(client, 0
) < 0) {
dev_warn(&client->dev, "probe failed\n");
goto exit_free;
}
dev_warn(&client->dev, "probe failed\n");
goto exit_free;
}