commit 136c4bbfe69336cd1d0b076cfc0ef6b92d576a19
author Len Brown <len.brown@intel.com> Sat Aug 25 02:24:03 2007 -0400
committer Len Brown <len.brown@intel.com> Sat Aug 25 02:24:03 2007 -0400
tree 7fd3cc3cc5dbf9d63a5823323d510144b1ce7a04
parent 25c87f7f2a4fc3e50a7912b1c78405d454d1c4d9
parent e6d9da1de0f31c57cfe3837b1b4e51c6d96fcd3c

Pull bugzilla-8798 into release branch

drivers/acpi/video.c

diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index 6659bdd..3c9bb85 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -1881,6 +1881,7 @@
 	return;
 }
 
+static int instance;
 static int acpi_video_bus_add(struct acpi_device *device)
 {
 	int result = 0;
@@ -1896,6 +1897,13 @@
 	if (!video)
 		return -ENOMEM;
 
+	/* a hack to fix the duplicate name "VID" problem on T61 */
+	if (!strcmp(device->pnp.bus_id, "VID")) {
+		if (instance)
+			device->pnp.bus_id[3] = '0' + instance;
+		instance ++;
+	}
+
 	video->device = device;
 	strcpy(acpi_device_name(device), ACPI_VIDEO_BUS_NAME);
 	strcpy(acpi_device_class(device), ACPI_VIDEO_CLASS);