2 files changed, 28 insertions, 6 deletions

diff --git a/drivers/video/via/accel.c b/drivers/video/via/accel.c
index e44893ea590d..c2f4e6e166f1 100644
--- a/drivers/video/via/accel.c
+++ b/drivers/video/via/accel.c
@@ -283,11 +283,12 @@ static int hw_bitblt_2(void __iomem *engine, u8 op, u32 width, u32 height,
                 writel(tmp, engine + 0x1C);
         }
 
-        if (op != VIA_BITBLT_COLOR)
+        if (op == VIA_BITBLT_FILL) {
+                writel(fg_color, engine + 0x58);
+        } else if (op == VIA_BITBLT_MONO) {
                 writel(fg_color, engine + 0x4C);
-
-        if (op == VIA_BITBLT_MONO)
                 writel(bg_color, engine + 0x50);
+        }
 
         if (op == VIA_BITBLT_FILL)
                 ge_cmd |= fill_rop << 24 | 0x00002000 | 0x00000001;
diff --git a/drivers/video/via/via_i2c.c b/drivers/video/via/via_i2c.c
index da9e4ca94b17..021112e279de 100644
--- a/drivers/video/via/via_i2c.c
+++ b/drivers/video/via/via_i2c.c
@@ -114,6 +114,7 @@ static void via_i2c_setsda(void *data, int state)
 
 int viafb_i2c_readbyte(u8 adap, u8 slave_addr, u8 index, u8 *pdata)
 {
+        int ret;
         u8 mm1[] = {0x00};
         struct i2c_msg msgs[2];
 
@@ -126,11 +127,18 @@ int viafb_i2c_readbyte(u8 adap, u8 slave_addr, u8 index, u8 *pdata)
         mm1[0] = index;
         msgs[0].len = 1; msgs[1].len = 1;
         msgs[0].buf = mm1; msgs[1].buf = pdata;
-        return i2c_transfer(&via_i2c_par[adap].adapter, msgs, 2);
+        ret = i2c_transfer(&via_i2c_par[adap].adapter, msgs, 2);
+        if (ret == 2)
+                ret = 0;
+        else if (ret >= 0)
+                ret = -EIO;
+
+        return ret;
 }
 
 int viafb_i2c_writebyte(u8 adap, u8 slave_addr, u8 index, u8 data)
 {
+        int ret;
         u8 msg[2] = { index, data };
         struct i2c_msg msgs;
 
@@ -140,11 +148,18 @@ int viafb_i2c_writebyte(u8 adap, u8 slave_addr, u8 index, u8 data)
         msgs.addr = slave_addr / 2;
         msgs.len = 2;
         msgs.buf = msg;
-        return i2c_transfer(&via_i2c_par[adap].adapter, &msgs, 1);
+        ret = i2c_transfer(&via_i2c_par[adap].adapter, &msgs, 1);
+        if (ret == 1)
+                ret = 0;
+        else if (ret >= 0)
+                ret = -EIO;
+
+        return ret;
 }
 
 int viafb_i2c_readbytes(u8 adap, u8 slave_addr, u8 index, u8 *buff, int buff_len)
 {
+        int ret;
         u8 mm1[] = {0x00};
         struct i2c_msg msgs[2];
 
@@ -156,7 +171,13 @@ int viafb_i2c_readbytes(u8 adap, u8 slave_addr, u8 index, u8 *buff, int buff_len
         mm1[0] = index;
         msgs[0].len = 1; msgs[1].len = buff_len;
         msgs[0].buf = mm1; msgs[1].buf = buff;
-        return i2c_transfer(&via_i2c_par[adap].adapter, msgs, 2);
+        ret = i2c_transfer(&via_i2c_par[adap].adapter, msgs, 2);
+        if (ret == 2)
+                ret = 0;
+        else if (ret >= 0)
+                ret = -EIO;
+
+        return ret;
 }
 
 /*