summaryrefslogtreecommitdiff
path: root/drivers/acpi/video.c
diff options
context:
space:
mode:
authorZhao Yakui <yakui.zhao@intel.com>2009-02-02 22:55:01 -0500
committerLen Brown <len.brown@intel.com>2009-02-02 22:55:01 -0500
commitf3b39f1393d5cebe56f43a584ef47efbebd2702c (patch)
treeacb034b994e2a156a223d919b776496463b9e36f /drivers/acpi/video.c
parent2b190e76def5233c542f6025b4a133b1d4bd1a37 (diff)
ACPI: proc_dir_entry 'video/VGA' already registered
eliminate the duplicate the name of "VGA" http://bugzilla.kernel.org/show_bug.cgi?id=12514 Signed-off-by: Zhao Yakui <yakui.zhao@intel.com> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/video.c')
-rw-r--r--drivers/acpi/video.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index f261737636da..1981eaf9fa7b 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -2006,6 +2006,12 @@ static int acpi_video_bus_add(struct acpi_device *device)
device->pnp.bus_id[3] = '0' + instance;
instance ++;
}
+ /* a hack to fix the duplicate name "VGA" problem on Pa 3553 */
+ if (!strcmp(device->pnp.bus_id, "VGA")) {
+ if (instance)
+ device->pnp.bus_id[3] = '0' + instance;
+ instance++;
+ }
video->device = device;
strcpy(acpi_device_name(device), ACPI_VIDEO_BUS_NAME);