From f5b2094d928525c19a93d62423dfa91552df1326 Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Thu, 28 Aug 2008 08:33:23 +0200 Subject: [PATCH] --- yaml --- r: 109295 b: refs/heads/master c: 4329cf8613b0c7cdc020005f0e1ea7378681f1d8 h: refs/heads/master i: 109293: 028963db60509a98ee8c51c76a06a5785ff2840a 109291: 40729984ccd4c22ab1f5f70b09bf28ff386b28ab 109287: 0495e10b456c3c3fc0e4b168c9237d4ff8604ca3 109279: 7552bd3c2073f1056e853814fbb042d3922b7811 v: v3 --- [refs] | 2 +- trunk/drivers/i2c/i2c-core.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 2818637aa94b..a274a00cee09 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 96e21e4fbc1b83a3445553381ec74f904618562e +refs/heads/master: 4329cf8613b0c7cdc020005f0e1ea7378681f1d8 diff --git a/trunk/drivers/i2c/i2c-core.c b/trunk/drivers/i2c/i2c-core.c index 4ac33670797f..b346a687ab59 100644 --- a/trunk/drivers/i2c/i2c-core.c +++ b/trunk/drivers/i2c/i2c-core.c @@ -1190,8 +1190,8 @@ int i2c_probe(struct i2c_adapter *adapter, && address_data->normal_i2c[0] == I2C_CLIENT_END) return 0; - dev_warn(&adapter->dev, "SMBus Quick command not supported, " - "can't probe for chips\n"); + dev_dbg(&adapter->dev, "SMBus Quick command not supported, " + "can't probe for chips\n"); return -EOPNOTSUPP; } @@ -1352,6 +1352,10 @@ static int i2c_detect(struct i2c_adapter *adapter, struct i2c_driver *driver) } } + /* Stop here if the classes do not match */ + if (!(adapter->class & driver->class)) + goto exit_free; + /* Stop here if we can't use SMBUS_QUICK */ if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_QUICK)) { if (address_data->probe[0] == I2C_CLIENT_END @@ -1364,10 +1368,6 @@ static int i2c_detect(struct i2c_adapter *adapter, struct i2c_driver *driver) goto exit_free; } - /* Stop here if the classes do not match */ - if (!(adapter->class & driver->class)) - goto exit_free; - /* Probe entries are done second, and are not affected by ignore entries either */ for (i = 0; address_data->probe[i] != I2C_CLIENT_END; i += 2) {