projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'usb-3.18-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
acpi
/
sysfs.c
diff --git
a/drivers/acpi/sysfs.c
b/drivers/acpi/sysfs.c
index 38cb9782d4b871f54c646fc360f922bac03a68fd..13e577c80201bb1ce4341f9b99007e28d1a0a261 100644
(file)
--- a/
drivers/acpi/sysfs.c
+++ b/
drivers/acpi/sysfs.c
@@
-537,7
+537,7
@@
static ssize_t counter_show(struct kobject *kobj,
if (result)
goto end;
if (result)
goto end;
- if (!(status & ACPI_EVENT_FLAG_HA
NDLE
))
+ if (!(status & ACPI_EVENT_FLAG_HA
S_HANDLER
))
size += sprintf(buf + size, " invalid");
else if (status & ACPI_EVENT_FLAG_ENABLED)
size += sprintf(buf + size, " enabled");
size += sprintf(buf + size, " invalid");
else if (status & ACPI_EVENT_FLAG_ENABLED)
size += sprintf(buf + size, " enabled");
@@
-581,7
+581,7
@@
static ssize_t counter_set(struct kobject *kobj,
if (result)
goto end;
if (result)
goto end;
- if (!(status & ACPI_EVENT_FLAG_HA
NDLE
)) {
+ if (!(status & ACPI_EVENT_FLAG_HA
S_HANDLER
)) {
printk(KERN_WARNING PREFIX
"Can not change Invalid GPE/Fixed Event status\n");
return -EINVAL;
printk(KERN_WARNING PREFIX
"Can not change Invalid GPE/Fixed Event status\n");
return -EINVAL;