aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/acpi/scan.c1
-rw-r--r--include/acpi/acpi_bus.h3
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index ab5a26469707..c73681b7e69e 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -1240,6 +1240,7 @@ acpi_add_single_object(struct acpi_device **child,
1240 return -ENOMEM; 1240 return -ENOMEM;
1241 } 1241 }
1242 1242
1243 device->device_type = type;
1243 device->handle = handle; 1244 device->handle = handle;
1244 device->parent = parent; 1245 device->parent = parent;
1245 device->bus_ops = *ops; /* workround for not call .start */ 1246 device->bus_ops = *ops; /* workround for not call .start */
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index 1cef1398e358..8456e8cbf9fd 100644
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -262,7 +262,8 @@ struct acpi_device_wakeup {
262/* Device */ 262/* Device */
263 263
264struct acpi_device { 264struct acpi_device {
265 acpi_handle handle; 265 int device_type;
266 acpi_handle handle; /* no handle for fixed hardware */
266 struct acpi_device *parent; 267 struct acpi_device *parent;
267 struct list_head children; 268 struct list_head children;
268 struct list_head node; 269 struct list_head node;