1 files changed, 10 insertions, 11 deletions

diff --git a/drivers/rtc/rtc-m41t80.c b/drivers/rtc/rtc-m41t80.c
index a3fb235fea0d..ebf50b1540f2 100644
--- a/drivers/rtc/rtc-m41t80.c
+++ b/drivers/rtc/rtc-m41t80.c
@@ -217,7 +217,7 @@ static int m41t80_rtc_read_time(struct device *dev, struct rtc_time *tm)
                                             sizeof(buf), buf);
         if (err < 0) {
                 dev_err(&client->dev, "Unable to read date\n");
-                return -EIO;
+                return err;
         }
 
         tm->tm_sec = bcd2bin(buf[M41T80_REG_SEC] & 0x7f);
@@ -274,10 +274,11 @@ static int m41t80_rtc_set_time(struct device *dev, struct rtc_time *tm)
         if (flags < 0)
                 return flags;
 
-        if (i2c_smbus_write_byte_data(client, M41T80_REG_FLAGS,
-                                      flags & ~M41T80_FLAGS_OF)) {
+        err = i2c_smbus_write_byte_data(client, M41T80_REG_FLAGS,
+                                        flags & ~M41T80_FLAGS_OF);
+        if (err < 0) {
                 dev_err(&client->dev, "Unable to write flags register\n");
-                return -EIO;
+                return err;
         }
 
         return err;
@@ -287,10 +288,12 @@ static int m41t80_rtc_proc(struct device *dev, struct seq_file *seq)
 {
         struct i2c_client *client = to_i2c_client(dev);
         struct m41t80_data *clientdata = i2c_get_clientdata(client);
-        u8 reg;
+        int reg;
 
         if (clientdata->features & M41T80_FEATURE_BL) {
                 reg = i2c_smbus_read_byte_data(client, M41T80_REG_FLAGS);
+                if (reg < 0)
+                        return reg;
                 seq_printf(seq, "battery\t\t: %s\n",
                            (reg & M41T80_FLAGS_BATT_LOW) ? "exhausted" : "ok");
         }
@@ -393,7 +396,7 @@ static int m41t80_read_alarm(struct device *dev, struct rtc_wkalrm *alrm)
         alrm->time.tm_min  = bcd2bin(alarmvals[3] & 0x7f);
         alrm->time.tm_hour = bcd2bin(alarmvals[2] & 0x3f);
         alrm->time.tm_mday = bcd2bin(alarmvals[1] & 0x3f);
-        alrm->time.tm_mon  = bcd2bin(alarmvals[0] & 0x3f);
+        alrm->time.tm_mon  = bcd2bin(alarmvals[0] & 0x3f) - 1;
 
         alrm->enabled = !!(alarmvals[0] & M41T80_ALMON_AFE);
         alrm->pending = (flags & M41T80_FLAGS_AF) && alrm->enabled;
@@ -939,11 +942,7 @@ static int m41t80_probe(struct i2c_client *client,
                 if (m41t80_data->features & M41T80_FEATURE_HT) {
                         m41t80_rtc_read_time(&client->dev, &tm);
                         dev_info(&client->dev, "HT bit was set!\n");
-                        dev_info(&client->dev,
-                                 "Power Down at %04i-%02i-%02i %02i:%02i:%02i\n",
-                                 tm.tm_year + 1900,
-                                 tm.tm_mon + 1, tm.tm_mday, tm.tm_hour,
-                                 tm.tm_min, tm.tm_sec);
+                        dev_info(&client->dev, "Power Down at %ptR\n", &tm);
                 }
                 rc = i2c_smbus_write_byte_data(client, M41T80_REG_ALARM_HOUR,
                                                rc & ~M41T80_ALHOUR_HT);