Commit 6125c2be authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'acpi-fixes' into fixes 

* acpi-fixes:
  PCI / ACPI: hold acpi_scan_lock during root bus hotplug
  ACPI / APEI: fix error status check condition for CPER
  ACPI / PM: fix suspend and resume on Sony Vaio VGN-FW21M
parents 887ede66 b8b66110

drivers/acpi/apei/cper.c

+1 −1
Original line number Diff line number Diff line
@@ -405,7 +405,7 @@ int apei_estatus_check(const struct acpi_hest_generic_status *estatus) 
		return rc;

	data_len = estatus->data_length;

	gdata = (struct acpi_hest_generic_data *)(estatus + 1);

	while (data_len > sizeof(*gdata)) {

	while (data_len >= sizeof(*gdata)) {

		gedata_len = gdata->error_data_length;

		if (gedata_len > data_len - sizeof(*gdata))

			return -EINVAL;

drivers/acpi/pci_root.c

+7 −2
Original line number Diff line number Diff line
@@ -646,6 +646,7 @@ static void handle_root_bridge_insertion(acpi_handle handle) 


static void handle_root_bridge_removal(struct acpi_device *device)

{

	acpi_status status;

	struct acpi_eject_event *ej_event;



	ej_event = kmalloc(sizeof(*ej_event), GFP_KERNEL);
@@ -661,7 +662,9 @@ static void handle_root_bridge_removal(struct acpi_device *device) 
	ej_event->device = device;

	ej_event->event = ACPI_NOTIFY_EJECT_REQUEST;



	acpi_bus_hot_remove_device(ej_event);

	status = acpi_os_hotplug_execute(acpi_bus_hot_remove_device, ej_event);

	if (ACPI_FAILURE(status))

		kfree(ej_event);

}



static void _handle_hotplug_event_root(struct work_struct *work)
@@ -676,8 +679,9 @@ static void _handle_hotplug_event_root(struct work_struct *work) 
	handle = hp_work->handle;

	type = hp_work->type;



	root = acpi_pci_find_root(handle);

	acpi_scan_lock_acquire();



	root = acpi_pci_find_root(handle);

	acpi_get_name(handle, ACPI_FULL_PATHNAME, &buffer);



	switch (type) {
@@ -711,6 +715,7 @@ static void _handle_hotplug_event_root(struct work_struct *work) 
		break;

	}



	acpi_scan_lock_release();

	kfree(hp_work); /* allocated in handle_hotplug_event_bridge */

	kfree(buffer.pointer);

}

drivers/acpi/sleep.c

+8 −0
Original line number Diff line number Diff line
@@ -193,6 +193,14 @@ static struct dmi_system_id __initdata acpisleep_dmi_table[] = { 
	},

	{

	.callback = init_nvs_nosave,

	.ident = "Sony Vaio VGN-FW21M",

	.matches = {

		DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),

		DMI_MATCH(DMI_PRODUCT_NAME, "VGN-FW21M"),

		},

	},

	{

	.callback = init_nvs_nosave,

	.ident = "Sony Vaio VPCEB17FX",

	.matches = {

		DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),