summaryrefslogtreecommitdiffstats
path: root/drivers/i2c/ppc4xx_i2c.c
diff options
context:
space:
mode:
authorGraeme Russ <graeme.russ@gmail.com>2011-08-29 02:14:05 +0000
committerWolfgang Denk <wd@denx.de>2011-10-01 21:54:49 +0200
commite3e454cd72f319908355427b1a3ae54b3dd53356 (patch)
treeb461a0dc8287aa0c7d3e3eab525cd4f76c27481a /drivers/i2c/ppc4xx_i2c.c
parent79df1208ee6984aa63468673c042667d121bb0bc (diff)
downloadu-boot-e3e454cd72f319908355427b1a3ae54b3dd53356.tar.gz
u-boot-e3e454cd72f319908355427b1a3ae54b3dd53356.tar.xz
u-boot-e3e454cd72f319908355427b1a3ae54b3dd53356.zip
console: Squelch pre-console output in console functions
There are some locations in the code which anticipate printf() being called before the console is ready by squelching printf() on gd->have_console. Move this squelching into printf(), vprintf(), puts() and putc(). Also make tstc() and getc() return 0 if console is not yet initialised Signed-off-by: Graeme Russ <graeme.russ@gmail.com> Tested-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'drivers/i2c/ppc4xx_i2c.c')
-rw-r--r--drivers/i2c/ppc4xx_i2c.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/i2c/ppc4xx_i2c.c b/drivers/i2c/ppc4xx_i2c.c
index c1cbe55bb9..53fedd594c 100644
--- a/drivers/i2c/ppc4xx_i2c.c
+++ b/drivers/i2c/ppc4xx_i2c.c
@@ -396,10 +396,7 @@ static int ppc4xx_i2c_transfer(uchar chip, uint addr, int alen, uchar *buffer,
#endif
if ((ret = i2c_transfer(read, chip << 1, &xaddr[4 - alen], alen,
buffer, len)) != 0) {
- if (gd->have_console) {
- printf("I2C %s: failed %d\n",
- read ? "read" : "write", ret);
- }
+ printf("I2C %s: failed %d\n", read ? "read" : "write", ret);
return 1;
}