summaryrefslogtreecommitdiffstats
path: root/drivers/rtc/rtc-rs5c372.c
diff options
context:
space:
mode:
authorAlessandro Zummo <a.zummo@towertech.it>2006-04-10 22:54:44 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-04-11 06:18:47 -0700
commit8289607249ad25ecfc9a3742873fcd8f319d5b09 (patch)
treec69bc65332554358fdd959136e2cb1e0f730ffef /drivers/rtc/rtc-rs5c372.c
parentadfb4341259f2f89baac2316a8a3660b63c1103b (diff)
downloadlinux-stable-8289607249ad25ecfc9a3742873fcd8f319d5b09.tar.gz
linux-stable-8289607249ad25ecfc9a3742873fcd8f319d5b09.tar.bz2
linux-stable-8289607249ad25ecfc9a3742873fcd8f319d5b09.zip
[PATCH] RTC subsystem: RS5C372 sysfs fix
Fix sysfs show() return code Signed-off-by: Alessandro Zummo <a.zummo@towertech.it> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/rtc/rtc-rs5c372.c')
-rw-r--r--drivers/rtc/rtc-rs5c372.c18
1 files changed, 10 insertions, 8 deletions
diff --git a/drivers/rtc/rtc-rs5c372.c b/drivers/rtc/rtc-rs5c372.c
index 48aecb890272..5e5cc10c675e 100644
--- a/drivers/rtc/rtc-rs5c372.c
+++ b/drivers/rtc/rtc-rs5c372.c
@@ -169,24 +169,26 @@ static struct rtc_class_ops rs5c372_rtc_ops = {
static ssize_t rs5c372_sysfs_show_trim(struct device *dev,
struct device_attribute *attr, char *buf)
{
- int trim;
+ int err, trim;
- if (rs5c372_get_trim(to_i2c_client(dev), NULL, &trim) == 0)
- return sprintf(buf, "0x%2x\n", trim);
+ err = rs5c372_get_trim(to_i2c_client(dev), NULL, &trim);
+ if (err)
+ return err;
- return 0;
+ return sprintf(buf, "0x%2x\n", trim);
}
static DEVICE_ATTR(trim, S_IRUGO, rs5c372_sysfs_show_trim, NULL);
static ssize_t rs5c372_sysfs_show_osc(struct device *dev,
struct device_attribute *attr, char *buf)
{
- int osc;
+ int err, osc;
- if (rs5c372_get_trim(to_i2c_client(dev), &osc, NULL) == 0)
- return sprintf(buf, "%d.%03d KHz\n", osc / 1000, osc % 1000);
+ err = rs5c372_get_trim(to_i2c_client(dev), &osc, NULL);
+ if (err)
+ return err;
- return 0;
+ return sprintf(buf, "%d.%03d KHz\n", osc / 1000, osc % 1000);
}
static DEVICE_ATTR(osc, S_IRUGO, rs5c372_sysfs_show_osc, NULL);