Commit f3b39f13 authored by Zhao Yakui's avatar Zhao Yakui Committed by Len Brown
Browse files

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: default avatarZhao Yakui <yakui.zhao@intel.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 2b190e76

drivers/acpi/video.c

+6 −0
Original line number Diff line number Diff line
@@ -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);