Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
* 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
i2c/pca954x: Initialize the mux to disconnected state
i2c-taos-evm: Fix log messages
+8
-7
+4
-4
drivers/i2c/busses/i2c-taos-evm.c
+4
-4
drivers/i2c/busses/i2c-taos-evm.c
···
234
234
235
235
if (taos->state != TAOS_STATE_IDLE) {
236
236
err = -ENODEV;
237
-
dev_dbg(&serio->dev, "TAOS EVM reset failed (state=%d, "
237
+
dev_err(&serio->dev, "TAOS EVM reset failed (state=%d, "
238
238
"pos=%d)\n", taos->state, taos->pos);
239
239
goto exit_close;
240
240
}
···
255
255
msecs_to_jiffies(250));
256
256
if (taos->state != TAOS_STATE_IDLE) {
257
257
err = -ENODEV;
258
-
dev_err(&adapter->dev, "Echo off failed "
258
+
dev_err(&serio->dev, "TAOS EVM echo off failed "
259
259
"(state=%d)\n", taos->state);
260
260
goto exit_close;
261
261
}
···
263
263
err = i2c_add_adapter(adapter);
264
264
if (err)
265
265
goto exit_close;
266
-
dev_dbg(&serio->dev, "Connected to TAOS EVM\n");
266
+
dev_info(&serio->dev, "Connected to TAOS EVM\n");
267
267
268
268
taos->client = taos_instantiate_device(adapter);
269
269
return 0;
···
288
288
serio_set_drvdata(serio, NULL);
289
289
kfree(taos);
290
290
291
-
dev_dbg(&serio->dev, "Disconnected from TAOS EVM\n");
291
+
dev_info(&serio->dev, "Disconnected from TAOS EVM\n");
292
292
}
293
293
294
294
static struct serio_device_id taos_serio_ids[] = {
+4
-3
drivers/i2c/muxes/pca954x.c
+4
-3
drivers/i2c/muxes/pca954x.c
···
201
201
202
202
i2c_set_clientdata(client, data);
203
203
204
-
/* Read the mux register at addr to verify
205
-
* that the mux is in fact present.
204
+
/* Write the mux register at addr to verify
205
+
* that the mux is in fact present. This also
206
+
* initializes the mux to disconnected state.
206
207
*/
207
-
if (i2c_smbus_read_byte(client) < 0) {
208
+
if (i2c_smbus_write_byte(client, 0) < 0) {
208
209
dev_warn(&client->dev, "probe failed\n");
209
210
goto exit_free;
210
211
}