Commit 4697fd6f authored by Len Brown's avatar Len Brown
Browse files

Merge branch 'launchpad-333386' into release

parents fee807e8 3a1151e3

drivers/acpi/video.c

+6 −1
Original line number Diff line number Diff line
@@ -1109,7 +1109,12 @@ static int acpi_video_bus_check(struct acpi_video_bus *video) 
	 */



	/* Does this device support video switching? */

	if (video->cap._DOS) {

	if (video->cap._DOS || video->cap._DOD) {

		if (!video->cap._DOS) {

			printk(KERN_WARNING FW_BUG

				"ACPI(%s) defines _DOD but not _DOS\n",

				acpi_device_bid(video->device));

		}

		video->flags.multihead = 1;

		status = 0;

	}

drivers/acpi/video_detect.c

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ long acpi_is_video_device(struct acpi_device *device) 
		return 0;



	/* Does this device able to support video switching ? */

	if (ACPI_SUCCESS(acpi_get_handle(device->handle, "_DOD", &h_dummy)) &&

	if (ACPI_SUCCESS(acpi_get_handle(device->handle, "_DOD", &h_dummy)) ||

	    ACPI_SUCCESS(acpi_get_handle(device->handle, "_DOS", &h_dummy)))

		video_caps |= ACPI_VIDEO_OUTPUT_SWITCHING;

CRA Git | Maintained and supported by SUSTech CRA and CCSE