Merge remote-tracking branch 'net-next/master' into mac80211-next

[karo-tx-linux.git] / drivers / rtc / rtc-rp5c01.c

diff --git a/drivers/rtc/rtc-rp5c01.c b/drivers/rtc/rtc-rp5c01.c
index b548551f385ccd170a8dd507496c052dc8d1e4ef..026035373ae65a446122c6ebf39df9364b58718a 100644 (file)
--- a/drivers/rtc/rtc-rp5c01.c
+++ b/drivers/rtc/rtc-rp5c01.c
@@ -170,7 +170,7 @@ static ssize_t rp5c01_nvram_read(struct file *filp, struct kobject *kobj,
 
        spin_lock_irq(&priv->lock);
 
-       for (count = 0; size > 0 && pos < RP5C01_MODE; count++, size--) {
+       for (count = 0; count < size; count++) {
                u8 data;
 
                rp5c01_write(priv,
@@ -200,7 +200,7 @@ static ssize_t rp5c01_nvram_write(struct file *filp, struct kobject *kobj,
 
        spin_lock_irq(&priv->lock);
 
-       for (count = 0; size > 0 && pos < RP5C01_MODE; count++, size--) {
+       for (count = 0; count < size; count++) {
                u8 data = *buf++;
 
                rp5c01_write(priv,