Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3c1e3896 authored by Zhang Rui's avatar Zhang Rui Committed by Jeff Garzik
Browse files

libata-acpi: don't call sleeping function from invalid context 

The problem is introduced by commit
664d080c.

acpi_evaluate_integer is a sleeping function,
and it should not be called with spin_lock_irqsave.
https://bugzilla.redhat.com/show_bug.cgi?id=451399



Signed-off-by: default avatarZhang Rui <rui.zhang@intel.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent edb80471

drivers/ata/libata-acpi.c

+4 −1
Original line number Diff line number Diff line
@@ -197,6 +197,10 @@ static void ata_acpi_handle_hotplug(struct ata_port *ap, struct ata_device *dev, 
		/* This device does not support hotplug */

		return;



	if (event == ACPI_NOTIFY_BUS_CHECK ||

	    event == ACPI_NOTIFY_DEVICE_CHECK)

		status = acpi_evaluate_integer(handle, "_STA", NULL, &sta);



	spin_lock_irqsave(ap->lock, flags);



	switch (event) {
@@ -204,7 +208,6 @@ static void ata_acpi_handle_hotplug(struct ata_port *ap, struct ata_device *dev, 
	case ACPI_NOTIFY_DEVICE_CHECK:

		ata_ehi_push_desc(ehi, "ACPI event");



		status = acpi_evaluate_integer(handle, "_STA", NULL, &sta);

		if (ACPI_FAILURE(status)) {

			ata_port_printk(ap, KERN_ERR,

				"acpi: failed to determine bay status (0x%x)\n",