Merge branches 'arm/rockchip', 'arm/exynos', 'arm/smmu', 'arm/mediatek', 'arm/io...

[karo-tx-linux.git] / drivers / power / power_supply_sysfs.c

diff --git a/drivers/power/power_supply_sysfs.c b/drivers/power/power_supply_sysfs.c
index 9134e3d2d95ef9bfbfca479fd276d93ad2e8e7fb..ed2d7fd0c734dc47fc192fe7cccf825c63e1a35b 100644 (file)
--- a/drivers/power/power_supply_sysfs.c
+++ b/drivers/power/power_supply_sysfs.c
@@ -125,7 +125,7 @@ static ssize_t power_supply_store_property(struct device *dev,
 
        value.intval = long_val;
 
-       ret = psy->desc->set_property(psy, off, &value);
+       ret = power_supply_set_property(psy, off, &value);
        if (ret < 0)
                return ret;
 
@@ -223,7 +223,7 @@ static umode_t power_supply_attr_is_visible(struct kobject *kobj,
 
                if (property == attrno) {
                        if (psy->desc->property_is_writeable &&
-                           power_supply_property_is_writeable(psy, property) > 0)
+                           psy->desc->property_is_writeable(psy, property) > 0)
                                mode |= S_IWUSR;
 
                        return mode;