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:50:33 -0800 |
| commit | 83fee7c6055707f2f2f1a45b76a8f9ce53925090 (patch) | |
| tree | 9a44ea916c9c2d5cdb4036cf93f57ea6d9b3879b /drivers | |
| parent | d72c92a4e3c9f1ef8ee48196dcc3d8f54a816cb4 (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>
Diffstat (limited to 'drivers')
| -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 baaff815bbc1..9bf8f86f536d 100644 --- a/drivers/acpi/video.c +++ b/drivers/acpi/video.c @@ -1991,6 +1991,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); |