Commit 015aefbb authored by Alessandro Zummo's avatar Alessandro Zummo Committed by Linus Torvalds
Browse files

[PATCH] RTC subsystem: X1205 sysfs cleanup

Fix sysfs show() return code
Signed-off-by: default avatarAlessandro Zummo <>
Signed-off-by: default avatarAndrew Morton <>
Signed-off-by: default avatarLinus Torvalds <>
parent 3903586a
......@@ -19,7 +19,7 @@
#include <linux/rtc.h>
#include <linux/delay.h>
#define DRV_VERSION "1.0.6"
#define DRV_VERSION "1.0.7"
/* Addresses to scan: none. This chip is located at
* 0x6f and uses a two bytes register addressing.
......@@ -473,24 +473,26 @@ static struct rtc_class_ops x1205_rtc_ops = {
static ssize_t x1205_sysfs_show_atrim(struct device *dev,
struct device_attribute *attr, char *buf)
int atrim;
int err, atrim;
if (x1205_get_atrim(to_i2c_client(dev), &atrim) == 0)
return sprintf(buf, "%d.%02d pF\n",
atrim / 1000, atrim % 1000);
return 0;
err = x1205_get_atrim(to_i2c_client(dev), &atrim);
if (err)
return err;
return sprintf(buf, "%d.%02d pF\n", atrim / 1000, atrim % 1000);
static DEVICE_ATTR(atrim, S_IRUGO, x1205_sysfs_show_atrim, NULL);
static ssize_t x1205_sysfs_show_dtrim(struct device *dev,
struct device_attribute *attr, char *buf)
int dtrim;
int err, dtrim;
if (x1205_get_dtrim(to_i2c_client(dev), &dtrim) == 0)
return sprintf(buf, "%d ppm\n", dtrim);
err = x1205_get_dtrim(to_i2c_client(dev), &dtrim);
if (err)
return err;
return 0;
return sprintf(buf, "%d ppm\n", dtrim);
static DEVICE_ATTR(dtrim, S_IRUGO, x1205_sysfs_show_dtrim, NULL);
Supports Markdown
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