Skip to content

Commit

Permalink
Revert "ACPI: video: Ignore devices that aren't present in hardware"
Browse files Browse the repository at this point in the history
This reverts commit 0119509.

http://bugzilla.kernel.org/show_bug.cgi?id=9995

Signed-off-by: Len Brown <len.brown@intel.com>
  • Loading branch information
Len Brown committed Mar 18, 2008
1 parent f0d6752 commit 77321e6
Showing 1 changed file with 0 additions and 29 deletions.
29 changes: 0 additions & 29 deletions drivers/acpi/video.c
Original file line number Diff line number Diff line change
Expand Up @@ -1337,37 +1337,8 @@ acpi_video_bus_write_DOS(struct file *file,

static int acpi_video_bus_add_fs(struct acpi_device *device)
{
long device_id;
int status;
struct proc_dir_entry *entry = NULL;
struct acpi_video_bus *video;
struct device *dev;

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);



video = acpi_driver_data(device);
Expand Down

0 comments on commit 77321e6

Please sign in to comment.