Skip to content

L
linux-davinci
Commit 136c4bbf authored by Len Brown's avatar Len Brown
Browse files
Options

Pull bugzilla-8798 into release branch

parents 25c87f7f e6d9da1d
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 0 deletions
drivers/acpi/video.c
View file @ 136c4bbf
...@@ -1881,6 +1881,7 @@ static void acpi_video_device_notify(acpi_handle handle, u32 event, void *data) ...@@ -1881,6 +1881,7 @@ static void acpi_video_device_notify(acpi_handle handle, u32 event, void *data)
return; return;
} }
static int instance;
static int acpi_video_bus_add(struct acpi_device *device) static int acpi_video_bus_add(struct acpi_device *device)
{ {
int result = 0; int result = 0;
...@@ -1896,6 +1897,13 @@ static int acpi_video_bus_add(struct acpi_device *device) ...@@ -1896,6 +1897,13 @@ static int acpi_video_bus_add(struct acpi_device *device)
if (!video) if (!video)
return -ENOMEM; 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; video->device = device;
strcpy(acpi_device_name(device), ACPI_VIDEO_BUS_NAME); strcpy(acpi_device_name(device), ACPI_VIDEO_BUS_NAME);
strcpy(acpi_device_class(device), ACPI_VIDEO_CLASS); strcpy(acpi_device_class(device), ACPI_VIDEO_CLASS);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment