OSDN Git Service

rtc: ds1685: fix crash caused by referencing wrong device struct
authorThomas Bogendoerfer <tbogendoerfer@suse.de>
Thu, 11 Apr 2019 14:33:21 +0000 (16:33 +0200)
committerAlexandre Belloni <alexandre.belloni@bootlin.com>
Fri, 12 Apr 2019 10:23:20 +0000 (12:23 +0200)
sysfs entries added by rtc_add_group are called with the rtc device
as argument and not the underlying device. Fixed by using the dev->parent

Fixes: cfb74916e2ec ("rtc: ds1685: use rtc_add_group")
Signed-off-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
drivers/rtc/rtc-ds1685.c

index 2710f25..2f5194d 100644 (file)
@@ -1004,7 +1004,7 @@ static ssize_t
 ds1685_rtc_sysfs_battery_show(struct device *dev,
                              struct device_attribute *attr, char *buf)
 {
-       struct ds1685_priv *rtc = dev_get_drvdata(dev);
+       struct ds1685_priv *rtc = dev_get_drvdata(dev->parent);
        u8 ctrld;
 
        ctrld = rtc->read(rtc, RTC_CTRL_D);
@@ -1024,7 +1024,7 @@ static ssize_t
 ds1685_rtc_sysfs_auxbatt_show(struct device *dev,
                              struct device_attribute *attr, char *buf)
 {
-       struct ds1685_priv *rtc = dev_get_drvdata(dev);
+       struct ds1685_priv *rtc = dev_get_drvdata(dev->parent);
        u8 ctrl4a;
 
        ds1685_rtc_switch_to_bank1(rtc);
@@ -1046,7 +1046,7 @@ static ssize_t
 ds1685_rtc_sysfs_serial_show(struct device *dev,
                             struct device_attribute *attr, char *buf)
 {
-       struct ds1685_priv *rtc = dev_get_drvdata(dev);
+       struct ds1685_priv *rtc = dev_get_drvdata(dev->parent);
        u8 ssn[8];
 
        ds1685_rtc_switch_to_bank1(rtc);