Merge tag 'for-linus-5.4-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux.git] / drivers / rtc / rtc-rv3029c2.c

diff --git a/drivers/rtc/rtc-rv3029c2.c b/drivers/rtc/rtc-rv3029c2.c
index 4a0e8ec015ccb4a162b166f65403b24a5b9715cf..4cdf6588e1d9ed248466f5cbdcc7523ef401e921 100644 (file)
--- a/drivers/rtc/rtc-rv3029c2.c
+++ b/drivers/rtc/rtc-rv3029c2.c
@@ -278,13 +278,13 @@ static int rv3029_eeprom_read(struct device *dev, u8 reg,
 static int rv3029_eeprom_write(struct device *dev, u8 reg,
                               u8 const buf[], size_t len)
 {
-       int ret;
+       int ret, err;
        size_t i;
        u8 tmp;
 
-       ret = rv3029_eeprom_enter(dev);
-       if (ret < 0)
-               return ret;
+       err = rv3029_eeprom_enter(dev);
+       if (err < 0)
+               return err;
 
        for (i = 0; i < len; i++, reg++) {
                ret = rv3029_read_regs(dev, reg, &tmp, 1);
@@ -300,11 +300,11 @@ static int rv3029_eeprom_write(struct device *dev, u8 reg,
                        break;
        }
 
-       ret = rv3029_eeprom_exit(dev);
-       if (ret < 0)
-               return ret;
+       err = rv3029_eeprom_exit(dev);
+       if (err < 0)
+               return err;
 
-       return 0;
+       return ret;
 }
 
 static int rv3029_eeprom_update_bits(struct device *dev,