diff options
author | Len Brown <len.brown@intel.com> | 2008-03-18 04:04:35 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2008-03-18 04:04:35 -0400 |
commit | 77321e624b64f1e5985a20f3cd16b94c96d0dbb4 (patch) | |
tree | b555227b42397b7e1536e805797876f0e3feeeec /drivers/acpi | |
parent | f0d6752c9fa51d24c86b57c76ec5b2926a716b23 (diff) |
Revert "ACPI: video: Ignore devices that aren't present in hardware"
This reverts commit 0119509c4fbc9adcef1472817fda295334612976.
http://bugzilla.kernel.org/show_bug.cgi?id=9995
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi')
-rw-r--r-- | drivers/acpi/video.c | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c index 98f1d4e5598..12fb44f1676 100644 --- a/drivers/acpi/video.c +++ b/drivers/acpi/video.c | |||
@@ -1337,37 +1337,8 @@ acpi_video_bus_write_DOS(struct file *file, | |||
1337 | 1337 | ||
1338 | static int acpi_video_bus_add_fs(struct acpi_device *device) | 1338 | static int acpi_video_bus_add_fs(struct acpi_device *device) |
1339 | { | 1339 | { |
1340 | long device_id; | ||
1341 | int status; | ||
1342 | struct proc_dir_entry *entry = NULL; | 1340 | struct proc_dir_entry *entry = NULL; |
1343 | struct acpi_video_bus *video; | 1341 | struct acpi_video_bus *video; |
1344 | struct device *dev; | ||
1345 | |||
1346 | status = | ||
1347 | acpi_evaluate_integer(device->handle, "_ADR", NULL, &device_id); | ||
1348 | |||
1349 | if (!ACPI_SUCCESS(status)) | ||
1350 | return -ENODEV; | ||
1351 | |||
1352 | /* We need to attempt to determine whether the _ADR refers to a | ||
1353 | PCI device or not. There's no terribly good way to do this, | ||
1354 | so the best we can hope for is to assume that there'll never | ||
1355 | be a video device in the host bridge */ | ||
1356 | if (device_id >= 0x10000) { | ||
1357 | /* It looks like a PCI device. Does it exist? */ | ||
1358 | dev = acpi_get_physical_device(device->handle); | ||
1359 | } else { | ||
1360 | /* It doesn't look like a PCI device. Does its parent | ||
1361 | exist? */ | ||
1362 | acpi_handle phandle; | ||
1363 | if (acpi_get_parent(device->handle, &phandle)) | ||
1364 | return -ENODEV; | ||
1365 | dev = acpi_get_physical_device(phandle); | ||
1366 | } | ||
1367 | if (!dev) | ||
1368 | return -ENODEV; | ||
1369 | put_device(dev); | ||
1370 | |||
1371 | 1342 | ||
1372 | 1343 | ||
1373 | video = acpi_driver_data(device); | 1344 | video = acpi_driver_data(device); |