mirror of
https://github.com/joel16/android_kernel_sony_msm8994_rework.git
synced 2025-01-04 02:30:22 +00:00
Pull bugzilla-8798 into release branch
This commit is contained in:
commit
136c4bbfe6
@ -1881,6 +1881,7 @@ static void acpi_video_device_notify(acpi_handle handle, u32 event, void *data)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int instance;
|
||||||
static int acpi_video_bus_add(struct acpi_device *device)
|
static int acpi_video_bus_add(struct acpi_device *device)
|
||||||
{
|
{
|
||||||
int result = 0;
|
int result = 0;
|
||||||
@ -1896,6 +1897,13 @@ static int acpi_video_bus_add(struct acpi_device *device)
|
|||||||
if (!video)
|
if (!video)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
|
||||||
|
/* a hack to fix the duplicate name "VID" problem on T61 */
|
||||||
|
if (!strcmp(device->pnp.bus_id, "VID")) {
|
||||||
|
if (instance)
|
||||||
|
device->pnp.bus_id[3] = '0' + instance;
|
||||||
|
instance ++;
|
||||||
|
}
|
||||||
|
|
||||||
video->device = device;
|
video->device = device;
|
||||||
strcpy(acpi_device_name(device), ACPI_VIDEO_BUS_NAME);
|
strcpy(acpi_device_name(device), ACPI_VIDEO_BUS_NAME);
|
||||||
strcpy(acpi_device_class(device), ACPI_VIDEO_CLASS);
|
strcpy(acpi_device_class(device), ACPI_VIDEO_CLASS);
|
||||||
|
Loading…
Reference in New Issue
Block a user