Skip to content

Commit

Permalink
[PATCH] RTC subsystem: RS5C372 sysfs fix
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Alessandro Zummo authored and Linus Torvalds committed Apr 11, 2006
1 parent adfb434 commit 8289607
Showing 1 changed file with 10 additions and 8 deletions.
18 changes: 10 additions & 8 deletions drivers/rtc/rtc-rs5c372.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down

0 comments on commit 8289607

Please sign in to comment.