summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorYasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>2014-09-03 13:39:13 +0900
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-09-17 09:19:20 -0700
commit089d41d4057ff601e34b701a4d03f06c479900aa (patch)
tree4742152b04fc5bfae6af79965b0aedda8c994a72 /include
parent4b56ddf9debed7505e336202209a8a2dfda5852d (diff)
downloadlinux-stable-089d41d4057ff601e34b701a4d03f06c479900aa.tar.gz
linux-stable-089d41d4057ff601e34b701a4d03f06c479900aa.tar.bz2
linux-stable-089d41d4057ff601e34b701a4d03f06c479900aa.zip
ACPI / scan: not cache _SUN value in struct acpi_device_pnp
commit a383b68d9fe9864c4d3b86f67ad6488f58136435 upstream. The _SUN device indentification object is not guaranteed to return the same value every time it is executed, so we should not cache its return value, but rather execute it every time as needed. If it is cached, an incorrect stale value may be used in some situations. This issue was exposed by commit 202317a573b2 (ACPI / scan: Add acpi_device objects for all device nodes in the namespace). Fix it by avoiding to cache the return value of _SUN. Fixes: 202317a573b2 (ACPI / scan: Add acpi_device objects for all device nodes in the namespace) Signed-off-by: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com> [ rjw: Changelog ] Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include')
-rw-r--r--include/acpi/acpi_bus.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index 8256eb4ad057..e9c4f190ffae 100644
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -228,7 +228,6 @@ struct acpi_device_pnp {
acpi_device_name device_name; /* Driver-determined */
acpi_device_class device_class; /* " */
union acpi_object *str_obj; /* unicode string for _STR method */
- unsigned long sun; /* _SUN */
};
#define acpi_device_bid(d) ((d)->pnp.bus_id)