aboutsummaryrefslogtreecommitdiff
path: root/drivers/acpi
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2007-08-25 02:24:03 -0400
committerLen Brown <len.brown@intel.com>2007-08-25 02:24:03 -0400
commit136c4bbfe69336cd1d0b076cfc0ef6b92d576a19 (patch)
tree7fd3cc3cc5dbf9d63a5823323d510144b1ce7a04 /drivers/acpi
parent25c87f7f2a4fc3e50a7912b1c78405d454d1c4d9 (diff)
parente6d9da1de0f31c57cfe3837b1b4e51c6d96fcd3c (diff)
Pull bugzilla-8798 into release branch
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/video.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index 6659bdd2a45..3c9bb85a6a9 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -1881,6 +1881,7 @@ static void acpi_video_device_notify(acpi_handle handle, u32 event, void *data)
return;
}
+static int instance;
static int acpi_video_bus_add(struct acpi_device *device)
{
int result = 0;
@@ -1896,6 +1897,13 @@ static int acpi_video_bus_add(struct acpi_device *device)
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);