]> git.baikalelectronics.ru Git - kernel.git/commit
ACPI / PM: Fix resource_lock dead lock in acpi_power_on_device
authorLin Ming <ming.m.lin@intel.com>
Thu, 13 Sep 2012 22:26:33 +0000 (00:26 +0200)
committerRafael J. Wysocki <rjw@sisk.pl>
Thu, 13 Sep 2012 22:26:33 +0000 (00:26 +0200)
commit79038e889933a18618911c26417b58406761aee6
tree677ca8a83277992ed9b8ad2ac75239fccc7f9e2d
parent4fac511aa76c0ad6d0784842020dfcbdfda02ea6
ACPI / PM: Fix resource_lock dead lock in acpi_power_on_device

Commit 3a15747("ACPI: Add interface to register/unregister device
to/from power resources") used resource_lock to protect the devices list
that relies on power resource. It caused a mutex dead lock, as below

    acpi_power_on ---> lock resource_lock
      __acpi_power_on
        acpi_power_on_device
          acpi_power_get_inferred_state
            acpi_power_get_list_state ---> lock resource_lock

This patch adds a new mutex "devices_lock" to protect the devices list
and calls acpi_power_on_device in acpi_power_on, instead of
__acpi_power_on, after the resource_lock is released.

[rjw: Changed data type of a boolean variable to bool.]

Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Aaron Lu <aaron.lu@intel.com>
Cc: stable@vger.kernel.org
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
drivers/acpi/power.c