diff options
author | Jean Delvare <khali@linux-fr.org> | 2011-06-29 05:36:10 -0400 |
---|---|---|
committer | Jean Delvare <khali@endymion.delvare> | 2011-06-29 05:36:10 -0400 |
commit | 9b640f2e154268cb516efcaf9c434f2e73c6783e (patch) | |
tree | 363896bb37573fc13af8ca4e68b5a861bf77ac24 | |
parent | b0af8dfdd67699e25083478c63eedef2e72ebd85 (diff) |
i2c-taos-evm: Fix log messages
* Print all error and information messages even when debugging is
disabled.
* Don't use adapter device to log messages before it is ready.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: stable@kernel.org
-rw-r--r-- | drivers/i2c/busses/i2c-taos-evm.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/i2c/busses/i2c-taos-evm.c b/drivers/i2c/busses/i2c-taos-evm.c index dd39c1eb03ed..26c352a09298 100644 --- a/drivers/i2c/busses/i2c-taos-evm.c +++ b/drivers/i2c/busses/i2c-taos-evm.c | |||
@@ -234,7 +234,7 @@ static int taos_connect(struct serio *serio, struct serio_driver *drv) | |||
234 | 234 | ||
235 | if (taos->state != TAOS_STATE_IDLE) { | 235 | if (taos->state != TAOS_STATE_IDLE) { |
236 | err = -ENODEV; | 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 | "pos=%d)\n", taos->state, taos->pos); | 238 | "pos=%d)\n", taos->state, taos->pos); |
239 | goto exit_close; | 239 | goto exit_close; |
240 | } | 240 | } |
@@ -255,7 +255,7 @@ static int taos_connect(struct serio *serio, struct serio_driver *drv) | |||
255 | msecs_to_jiffies(250)); | 255 | msecs_to_jiffies(250)); |
256 | if (taos->state != TAOS_STATE_IDLE) { | 256 | if (taos->state != TAOS_STATE_IDLE) { |
257 | err = -ENODEV; | 257 | err = -ENODEV; |
258 | dev_err(&adapter->dev, "Echo off failed " | 258 | dev_err(&serio->dev, "TAOS EVM echo off failed " |
259 | "(state=%d)\n", taos->state); | 259 | "(state=%d)\n", taos->state); |
260 | goto exit_close; | 260 | goto exit_close; |
261 | } | 261 | } |
@@ -263,7 +263,7 @@ static int taos_connect(struct serio *serio, struct serio_driver *drv) | |||
263 | err = i2c_add_adapter(adapter); | 263 | err = i2c_add_adapter(adapter); |
264 | if (err) | 264 | if (err) |
265 | goto exit_close; | 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 | taos->client = taos_instantiate_device(adapter); | 268 | taos->client = taos_instantiate_device(adapter); |
269 | return 0; | 269 | return 0; |
@@ -288,7 +288,7 @@ static void taos_disconnect(struct serio *serio) | |||
288 | serio_set_drvdata(serio, NULL); | 288 | serio_set_drvdata(serio, NULL); |
289 | kfree(taos); | 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 | static struct serio_device_id taos_serio_ids[] = { | 294 | static struct serio_device_id taos_serio_ids[] = { |