summaryrefslogtreecommitdiffstats
path: root/board
diff options
context:
space:
mode:
authorDirk Eibach <dirk.eibach@gdsys.cc>2014-11-13 19:21:15 +0100
committerStefan Roese <sr@denx.de>2014-11-19 08:48:41 +0100
commita61762d294b1e76d5bdb5fd6c514f4404515ad82 (patch)
tree7ccf9fbfa547a8dad3f2f3664001793cc6d21a43 /board
parentf1cdde28338806ebb309576d9235b3701aa00548 (diff)
downloadblackbird-obmc-uboot-a61762d294b1e76d5bdb5fd6c514f4404515ad82.tar.gz
blackbird-obmc-uboot-a61762d294b1e76d5bdb5fd6c514f4404515ad82.zip
board: dlvision-10g: Compile fix
Signed-off-by: Dirk Eibach <dirk.eibach@gdsys.cc> Signed-off-by: Stefan Roese <sr@denx.de>
Diffstat (limited to 'board')
-rw-r--r--board/gdsys/common/osd.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/board/gdsys/common/osd.c b/board/gdsys/common/osd.c
index 1c765e4cbf..55ecdf1012 100644
--- a/board/gdsys/common/osd.c
+++ b/board/gdsys/common/osd.c
@@ -289,7 +289,6 @@ int osd_probe(unsigned screen)
{
u16 version;
u16 features;
- u8 value;
int old_bus = i2c_get_bus_num();
bool pixclock_present = false;
bool output_driver_present = false;
@@ -330,7 +329,8 @@ int osd_probe(unsigned screen)
#ifdef CONFIG_SYS_CH7301_I2C
i2c_set_bus_num(ch7301_i2c[screen]);
if (!i2c_probe(CH7301_I2C_ADDR)) {
- value = i2c_reg_read(CH7301_I2C_ADDR, CH7301_DID);
+ u8 value = i2c_reg_read(CH7301_I2C_ADDR, CH7301_DID);
+
if (value == 0x17) {
i2c_reg_write(CH7301_I2C_ADDR, CH7301_TPCP, 0x08);
i2c_reg_write(CH7301_I2C_ADDR, CH7301_TPD, 0x16);
@@ -345,8 +345,7 @@ int osd_probe(unsigned screen)
#ifdef CONFIG_SYS_SIL1178_I2C
i2c_set_bus_num(sil1178_i2c[screen]);
if (!i2c_probe(SIL1178_SLAVE_I2C_ADDRESS)) {
- value = i2c_reg_read(SIL1178_SLAVE_I2C_ADDRESS, 0x02);
- if (value == 0x06) {
+ if (i2c_reg_read(SIL1178_SLAVE_I2C_ADDRESS, 0x02) == 0x06) {
/*
* magic initialization sequence,
* adapted from datasheet
OpenPOWER on IntegriCloud