Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f0d6752c authored by Len Brown's avatar Len Brown
Browse files

Revert "ACPI: video: Ignore ACPI video devices that aren't present in hardware" 

This reverts commit 3fa2cdcc.

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

Signed-off-by: Len Brown <len.brown>
parent bde4f8fa

drivers/acpi/video.c

+1 −30
Original line number Diff line number Diff line
@@ -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.

	 */