diff options
| author | Len Brown <len.brown@intel.com> | 2008-03-18 01:43:53 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-03-18 01:43:53 -0400 |
| commit | f0d6752c9fa51d24c86b57c76ec5b2926a716b23 (patch) | |
| tree | 00275f81a5a154947a982de9b5aef5df171ce9ec /drivers/acpi | |
| parent | bde4f8fa8db2abd5ac9c542d76012d0fedab050f (diff) | |
| download | kernel-crypto-f0d6752c9fa51d24c86b57c76ec5b2926a716b23.tar.gz kernel-crypto-f0d6752c9fa51d24c86b57c76ec5b2926a716b23.tar.xz kernel-crypto-f0d6752c9fa51d24c86b57c76ec5b2926a716b23.zip | |
Revert "ACPI: video: Ignore ACPI video devices that aren't present in hardware"
This reverts commit 3fa2cdcc45a0176de15cac9dbf4ed2834ebf8932.
http://bugzilla.kernel.org/show_bug.cgi?id=9995
Signed-off-by: Len Brown <len.brown>
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/video.c | 31 |
1 files changed, 1 insertions, 30 deletions
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c index 1bc0c74f275..98f1d4e5598 100644 --- a/drivers/acpi/video.c +++ b/drivers/acpi/video.c @@ -807,40 +807,11 @@ static void acpi_video_bus_find_cap(struct acpi_video_bus *video) static int acpi_video_bus_check(struct acpi_video_bus *video) { acpi_status status = -ENOENT; - long device_id; - struct device *dev; - struct acpi_device *device; + if (!video) return -EINVAL; - device = video->device; - - status = - acpi_evaluate_integer(device->handle, "_ADR", NULL, &device_id); - - if (!ACPI_SUCCESS(status)) - return -ENODEV; - - /* We need to attempt to determine whether the _ADR refers to a - PCI device or not. There's no terribly good way to do this, - so the best we can hope for is to assume that there'll never - be a video device in the host bridge */ - if (device_id >= 0x10000) { - /* It looks like a PCI device. Does it exist? */ - dev = acpi_get_physical_device(device->handle); - } else { - /* It doesn't look like a PCI device. Does its parent - exist? */ - acpi_handle phandle; - if (acpi_get_parent(device->handle, &phandle)) - return -ENODEV; - dev = acpi_get_physical_device(phandle); - } - if (!dev) - return -ENODEV; - put_device(dev); - /* Since there is no HID, CID and so on for VGA driver, we have * to check well known required nodes. */ |