diff options
| author | Zhao Yakui <yakui.zhao@intel.com> | 2009-02-02 22:55:01 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-02-12 09:31:08 -0800 |
| commit | 265be30a8f3fbfbab0b16b44c6ac4715ff08e27b (patch) | |
| tree | b267b002aaedd160f4e51f8e2c524574e7a4c462 | |
| parent | c538029f32770f5641143df3c09db79439988cf4 (diff) | |
ACPI: proc_dir_entry 'video/VGA' already registered
commit f3b39f1393d5cebe56f43a584ef47efbebd2702c upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/acpi/video.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c index 42e1e842ee51..feac0b4b9040 100644 --- a/drivers/acpi/video.c +++ b/drivers/acpi/video.c @@ -1983,6 +1983,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); |