summaryrefslogtreecommitdiffstats
path: root/drivers/platform
diff options
context:
space:
mode:
authorDarren Hart (VMware) <dvhart@infradead.org>2017-04-19 18:11:33 -0700
committerDarren Hart (VMware) <dvhart@infradead.org>2017-04-20 13:26:18 -0700
commita055f9ecb5b4d0cb8b33ba664363a2ed7804a6c7 (patch)
tree01b87a06997ebe4fd8a4b26a205738ce7fc4d528 /drivers/platform
parentc21ee12f460c33fcc12fe162c9ab98f3c58073aa (diff)
downloadlinux-a055f9ecb5b4d0cb8b33ba664363a2ed7804a6c7.tar.gz
linux-a055f9ecb5b4d0cb8b33ba664363a2ed7804a6c7.tar.bz2
linux-a055f9ecb5b4d0cb8b33ba664363a2ed7804a6c7.zip
platform/x86: hp-wmi: Do not shadow errors in sysfs show functions
The new hp_wmi_read_int function returns a negative value in case of error, pass this on directly rather than always replacing it with -EINVAL. Signed-off-by: Darren Hart (VMware) <dvhart@infradead.org> Tested-by: Carlo Caione <carlo@endlessm.com> Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Diffstat (limited to 'drivers/platform')
-rw-r--r--drivers/platform/x86/hp-wmi.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/platform/x86/hp-wmi.c b/drivers/platform/x86/hp-wmi.c
index d1e3af23a147..e685018670c0 100644
--- a/drivers/platform/x86/hp-wmi.c
+++ b/drivers/platform/x86/hp-wmi.c
@@ -408,7 +408,7 @@ static ssize_t display_show(struct device *dev, struct device_attribute *attr,
{
int value = hp_wmi_read_int(HPWMI_DISPLAY_QUERY);
if (value < 0)
- return -EINVAL;
+ return value;
return sprintf(buf, "%d\n", value);
}
@@ -417,7 +417,7 @@ static ssize_t hddtemp_show(struct device *dev, struct device_attribute *attr,
{
int value = hp_wmi_read_int(HPWMI_HDDTEMP_QUERY);
if (value < 0)
- return -EINVAL;
+ return value;
return sprintf(buf, "%d\n", value);
}
@@ -426,7 +426,7 @@ static ssize_t als_show(struct device *dev, struct device_attribute *attr,
{
int value = hp_wmi_read_int(HPWMI_ALS_QUERY);
if (value < 0)
- return -EINVAL;
+ return value;
return sprintf(buf, "%d\n", value);
}
@@ -435,7 +435,7 @@ static ssize_t dock_show(struct device *dev, struct device_attribute *attr,
{
int value = hp_wmi_hw_state(HPWMI_DOCK_MASK);
if (value < 0)
- return -EINVAL;
+ return value;
return sprintf(buf, "%d\n", value);
}
@@ -444,7 +444,7 @@ static ssize_t tablet_show(struct device *dev, struct device_attribute *attr,
{
int value = hp_wmi_hw_state(HPWMI_TABLET_MASK);
if (value < 0)
- return -EINVAL;
+ return value;
return sprintf(buf, "%d\n", value);
}
@@ -454,7 +454,7 @@ static ssize_t postcode_show(struct device *dev, struct device_attribute *attr,
/* Get the POST error code of previous boot failure. */
int value = hp_wmi_read_int(HPWMI_POSTCODEERROR_QUERY);
if (value < 0)
- return -EINVAL;
+ return value;
return sprintf(buf, "0x%x\n", value);
}