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>

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);