From: Zhao Yakui <yakui.zhao@intel.com>
Date: Tue, 3 Feb 2009 03:55:01 +0000 (-0500)
Subject: ACPI: proc_dir_entry 'video/VGA' already registered
X-Git-Tag: firefly_0821_release~15612^2^6~7
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f3b39f1393d5cebe56f43a584ef47efbebd2702c;p=firefly-linux-kernel-4.4.55.git

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

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