aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorCorentin Chary <corentin.chary@gmail.com>2011-07-01 05:34:38 -0400
committerMatthew Garrett <mjg@redhat.com>2011-08-05 14:46:02 -0400
commit3df5fdadf6400373a696bb14e27d4771e5f6afb3 (patch)
treecc4e47a641735d708ed5abd67a7ee75b427d1448 /drivers
parente02431d6f5e8f1023ce0cfbaf70ddf4afae924d8 (diff)
asus-wmi: return proper value in store_cpufv()
Cc: stable@kernel.org Signed-off-by: Corentin Chary <corentin.chary@gmail.com> Signed-off-by: Matthew Garrett <mjg@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/platform/x86/asus-wmi.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
index e50872632c5a..3b9fb91e25ff 100644
--- a/drivers/platform/x86/asus-wmi.c
+++ b/drivers/platform/x86/asus-wmi.c
@@ -1307,14 +1307,18 @@ ASUS_WMI_CREATE_DEVICE_ATTR(cardr, 0644, ASUS_WMI_DEVID_CARDREADER);
1307static ssize_t store_cpufv(struct device *dev, struct device_attribute *attr, 1307static ssize_t store_cpufv(struct device *dev, struct device_attribute *attr,
1308 const char *buf, size_t count) 1308 const char *buf, size_t count)
1309{ 1309{
1310 int value; 1310 int value, rv;
1311 1311
1312 if (!count || sscanf(buf, "%i", &value) != 1) 1312 if (!count || sscanf(buf, "%i", &value) != 1)
1313 return -EINVAL; 1313 return -EINVAL;
1314 if (value < 0 || value > 2) 1314 if (value < 0 || value > 2)
1315 return -EINVAL; 1315 return -EINVAL;
1316 1316
1317 return asus_wmi_evaluate_method(ASUS_WMI_METHODID_CFVS, value, 0, NULL); 1317 rv = asus_wmi_evaluate_method(ASUS_WMI_METHODID_CFVS, value, 0, NULL);
1318 if (rv < 0)
1319 return rv;
1320
1321 return count;
1318} 1322}
1319 1323
1320static DEVICE_ATTR(cpufv, S_IRUGO | S_IWUSR, NULL, store_cpufv); 1324static DEVICE_ATTR(cpufv, S_IRUGO | S_IWUSR, NULL, store_cpufv);