diff options
| author | Len Brown <len.brown@intel.com> | 2009-09-05 13:38:34 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-09-05 13:38:34 -0400 |
| commit | 8ff0e082f0833d32c7523a6cd72b6cf6a2142ce8 (patch) | |
| tree | 2a0cac3d11c4dfcab87e0387d2862ff714fd8cdc /drivers/acpi | |
| parent | 8aeb0a352af7eb26863e53c203eeb852fd4590c3 (diff) | |
| parent | f61f925859c57f6175082aeeee17743c68558a6e (diff) | |
| download | talos-obmc-linux-8ff0e082f0833d32c7523a6cd72b6cf6a2142ce8.tar.gz talos-obmc-linux-8ff0e082f0833d32c7523a6cd72b6cf6a2142ce8.zip | |
Merge branch 'bugzilla-13002' into release
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/scan.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index 781435d7e369..5dd702c9c1fa 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -1264,16 +1264,6 @@ acpi_add_single_object(struct acpi_device **child, acpi_device_set_id(device, parent, handle, type); /* - * The ACPI device is attached to acpi handle before getting - * the power/wakeup/peformance flags. Otherwise OS can't get - * the corresponding ACPI device by the acpi handle in the course - * of getting the power/wakeup/performance flags. - */ - result = acpi_device_set_context(device, type); - if (result) - goto end; - - /* * Power Management * ---------------- */ @@ -1303,6 +1293,8 @@ acpi_add_single_object(struct acpi_device **child, goto end; } + if ((result = acpi_device_set_context(device, type))) + goto end; result = acpi_device_register(device, parent); |
