Merge branch 'master'

2 files changed, 9 insertions, 4 deletions

diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c
index 8e0f3158215f..dfca74933625 100644
--- a/drivers/i2c/busses/i2c-i801.c
+++ b/drivers/i2c/busses/i2c-i801.c
@@ -478,6 +478,11 @@ static s32 i801_access(struct i2c_adapter * adap, u16 addr,
                 ret = i801_transaction();
         }
 
+        /* Some BIOSes don't like it when PEC is enabled at reboot or resume
+           time, so we forcibly disable it after every transaction. */
+        if (hwpec)
+                outb_p(0, SMBAUXCTL);
+
         if(block)
                 return ret;
         if(ret)
diff --git a/drivers/i2c/chips/m41t00.c b/drivers/i2c/chips/m41t00.c
index 27fc9ff2961a..99ab4ec34390 100644
--- a/drivers/i2c/chips/m41t00.c
+++ b/drivers/i2c/chips/m41t00.c
@@ -131,13 +131,13 @@ m41t00_set(void *arg)
         if ((i2c_smbus_write_byte_data(save_client, 0, tm.tm_sec & 0x7f) < 0)
                 || (i2c_smbus_write_byte_data(save_client, 1, tm.tm_min & 0x7f)
                         < 0)
-                || (i2c_smbus_write_byte_data(save_client, 2, tm.tm_hour & 0x7f)
+                || (i2c_smbus_write_byte_data(save_client, 2, tm.tm_hour & 0x3f)
                         < 0)
-                || (i2c_smbus_write_byte_data(save_client, 4, tm.tm_mday & 0x7f)
+                || (i2c_smbus_write_byte_data(save_client, 4, tm.tm_mday & 0x3f)
                         < 0)
-                || (i2c_smbus_write_byte_data(save_client, 5, tm.tm_mon & 0x7f)
+                || (i2c_smbus_write_byte_data(save_client, 5, tm.tm_mon & 0x1f)
                         < 0)
-                || (i2c_smbus_write_byte_data(save_client, 6, tm.tm_year & 0x7f)
+                || (i2c_smbus_write_byte_data(save_client, 6, tm.tm_year & 0xff)
                         < 0))
 
                 dev_warn(&save_client->dev,"m41t00: can't write to rtc chip\n");