Commit b00eeaed authored by Joshua Kinard's avatar Joshua Kinard Committed by Linus Torvalds

drivers/rtc/rtc-ds1685.c: fix conditional in ds1685_rtc_sysfs_time_regs_{show,store}

Fix a conditional statement checking for NULL in both
ds1685_rtc_sysfs_time_regs_show and ds1685_rtc_sysfs_time_regs_store
that was using a logical AND when it should be using a logical OR so
that we fail out of the function properly if the condition ever
evaluates to true.

Fixes: aaaf5fbf ("rtc: add driver for DS1685 family of real time clocks")
Signed-off-by: default avatarJoshua Kinard <kumba@gentoo.org>
Reported-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 957ed60b
...@@ -1610,7 +1610,7 @@ ds1685_rtc_sysfs_time_regs_show(struct device *dev, ...@@ -1610,7 +1610,7 @@ ds1685_rtc_sysfs_time_regs_show(struct device *dev,
ds1685_rtc_sysfs_time_regs_lookup(attr->attr.name, false); ds1685_rtc_sysfs_time_regs_lookup(attr->attr.name, false);
/* Make sure we actually matched something. */ /* Make sure we actually matched something. */
if (!bcd_reg_info && !bin_reg_info) if (!bcd_reg_info || !bin_reg_info)
return -EINVAL; return -EINVAL;
/* bcd_reg_info->reg == bin_reg_info->reg. */ /* bcd_reg_info->reg == bin_reg_info->reg. */
...@@ -1648,7 +1648,7 @@ ds1685_rtc_sysfs_time_regs_store(struct device *dev, ...@@ -1648,7 +1648,7 @@ ds1685_rtc_sysfs_time_regs_store(struct device *dev,
return -EINVAL; return -EINVAL;
/* Make sure we actually matched something. */ /* Make sure we actually matched something. */
if (!bcd_reg_info && !bin_reg_info) if (!bcd_reg_info || !bin_reg_info)
return -EINVAL; return -EINVAL;
/* Check for a valid range. */ /* Check for a valid range. */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment