From 8cd5aca3804b6939b2464e7677dcefed39825bcd Mon Sep 17 00:00:00 2001 From: Corentin Chary Date: Fri, 1 Jul 2011 11:34:38 +0200 Subject: [PATCH] --- yaml --- r: 262607 b: refs/heads/master c: 3df5fdadf6400373a696bb14e27d4771e5f6afb3 h: refs/heads/master i: 262605: 3fc013616762e780d328090d561646dd4b588e44 262603: dec29445b57093ac9065ace293a272bceaf705d3 262599: 2758300d4cfce1d9e0bbe98ad54b939e744c9cda 262591: 99f7fec6f69028bf1fbb9cd164ec0a02a34ae745 v: v3 --- [refs] | 2 +- trunk/drivers/platform/x86/asus-wmi.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 53b214959e1b..fbdc94879446 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e02431d6f5e8f1023ce0cfbaf70ddf4afae924d8 +refs/heads/master: 3df5fdadf6400373a696bb14e27d4771e5f6afb3 diff --git a/trunk/drivers/platform/x86/asus-wmi.c b/trunk/drivers/platform/x86/asus-wmi.c index e50872632c5a..3b9fb91e25ff 100644 --- a/trunk/drivers/platform/x86/asus-wmi.c +++ b/trunk/drivers/platform/x86/asus-wmi.c @@ -1307,14 +1307,18 @@ ASUS_WMI_CREATE_DEVICE_ATTR(cardr, 0644, ASUS_WMI_DEVID_CARDREADER); static ssize_t store_cpufv(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) { - int value; + int value, rv; if (!count || sscanf(buf, "%i", &value) != 1) return -EINVAL; if (value < 0 || value > 2) return -EINVAL; - return asus_wmi_evaluate_method(ASUS_WMI_METHODID_CFVS, value, 0, NULL); + rv = asus_wmi_evaluate_method(ASUS_WMI_METHODID_CFVS, value, 0, NULL); + if (rv < 0) + return rv; + + return count; } static DEVICE_ATTR(cpufv, S_IRUGO | S_IWUSR, NULL, store_cpufv);