diff options
| author | Tejun Heo <tj@kernel.org> | 2015-11-04 01:29:03 +0300 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2015-11-04 01:29:03 +0300 |
| commit | 159b5bb46492e4dcef2070b12861030bc360402b (patch) | |
| tree | 93de7d6e94a059aade50ee5437de6a50ccd1cf7b /drivers/rtc/rtc-ds1742.c | |
| parent | 56e74338a535cbcc2f2da08b1ea1a92920194364 (diff) | |
| parent | 469eabb3aec03d9defed3462df743a223a5c8f54 (diff) | |
| download | linux-159b5bb46492e4dcef2070b12861030bc360402b.tar.xz | |
Merge branch 'for-4.3-fixes' into for-4.4
Diffstat (limited to 'drivers/rtc/rtc-ds1742.c')
| -rw-r--r-- | drivers/rtc/rtc-ds1742.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/rtc/rtc-ds1742.c b/drivers/rtc/rtc-ds1742.c index 0f8d8ace1515..c5168b3bcf1a 100644 --- a/drivers/rtc/rtc-ds1742.c +++ b/drivers/rtc/rtc-ds1742.c @@ -134,7 +134,7 @@ static ssize_t ds1742_nvram_read(struct file *filp, struct kobject *kobj, void __iomem *ioaddr = pdata->ioaddr_nvram; ssize_t count; - for (count = 0; size > 0 && pos < pdata->size_nvram; count++, size--) + for (count = 0; count < size; count++) *buf++ = readb(ioaddr + pos++); return count; } @@ -149,7 +149,7 @@ static ssize_t ds1742_nvram_write(struct file *filp, struct kobject *kobj, void __iomem *ioaddr = pdata->ioaddr_nvram; ssize_t count; - for (count = 0; size > 0 && pos < pdata->size_nvram; count++, size--) + for (count = 0; count < size; count++) writeb(*buf++, ioaddr + pos++); return count; } |