From 17016aeacd357a6d8551ec80d6b2eea30f525ee8 Mon Sep 17 00:00:00 2001 From: Petri Gynther Date: Wed, 29 Jun 2011 11:36:11 +0200 Subject: [PATCH] --- yaml --- r: 254191 b: refs/heads/master c: cd823db8b1161ef0d756514d280715a576d65cc3 h: refs/heads/master i: 254189: 750a01a240600f112e789cc149a67d57df157474 254187: 982028164b3743e34482e1eb176f24a2311dbd60 254183: 1c6e99fa251b5082efe082559605634e81704dd6 254175: 8297a3cc1a4b9515e7a252193722d4d6dcee972e v: v3 --- [refs] | 2 +- trunk/drivers/i2c/muxes/pca954x.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 53d1ffb45550..41740a23f0f8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9b640f2e154268cb516efcaf9c434f2e73c6783e +refs/heads/master: cd823db8b1161ef0d756514d280715a576d65cc3 diff --git a/trunk/drivers/i2c/muxes/pca954x.c b/trunk/drivers/i2c/muxes/pca954x.c index 54e1ce73534b..6f8953664636 100644 --- a/trunk/drivers/i2c/muxes/pca954x.c +++ b/trunk/drivers/i2c/muxes/pca954x.c @@ -201,10 +201,11 @@ static int pca954x_probe(struct i2c_client *client, 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; }