* [PATCH] ACPI/Power: Release resource_lock after acpi_power_get_state() return error
@ 2013-10-15 11:48 Lan Tianyu
2013-10-15 21:06 ` Rafael J. Wysocki
0 siblings, 1 reply; 2+ messages in thread
From: Lan Tianyu @ 2013-10-15 11:48 UTC (permalink / raw)
To: lenb, rjw; +Cc: Lan Tianyu, linux-acpi, linux-kernel
resource_lock should be released when acpi_power_get_state() fails and before
passing to next power resource on the acpi power resource list.
Signed-off-by: Lan Tianyu <tianyu.lan@intel.com>
---
drivers/acpi/power.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c
index 0dbe5cd..0c1c3ec 100644
--- a/drivers/acpi/power.c
+++ b/drivers/acpi/power.c
@@ -936,8 +936,10 @@ void acpi_resume_power_resources(void)
mutex_lock(&resource->resource_lock);
result = acpi_power_get_state(resource->device.handle, &state);
- if (result)
+ if (result) {
+ mutex_unlock(&resource->resource_lock);
continue;
+ }
if (state == ACPI_POWER_RESOURCE_STATE_OFF
&& resource->ref_count) {
--
1.8.2.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] ACPI/Power: Release resource_lock after acpi_power_get_state() return error
2013-10-15 11:48 [PATCH] ACPI/Power: Release resource_lock after acpi_power_get_state() return error Lan Tianyu
@ 2013-10-15 21:06 ` Rafael J. Wysocki
0 siblings, 0 replies; 2+ messages in thread
From: Rafael J. Wysocki @ 2013-10-15 21:06 UTC (permalink / raw)
To: Lan Tianyu; +Cc: lenb, linux-acpi, linux-kernel
On Tuesday, October 15, 2013 07:48:11 PM Lan Tianyu wrote:
> resource_lock should be released when acpi_power_get_state() fails and before
> passing to next power resource on the acpi power resource list.
>
> Signed-off-by: Lan Tianyu <tianyu.lan@intel.com>
Yup, good catch!
I'll queue this up as a fix for 3.12.
Thanks!
> ---
> drivers/acpi/power.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c
> index 0dbe5cd..0c1c3ec 100644
> --- a/drivers/acpi/power.c
> +++ b/drivers/acpi/power.c
> @@ -936,8 +936,10 @@ void acpi_resume_power_resources(void)
> mutex_lock(&resource->resource_lock);
>
> result = acpi_power_get_state(resource->device.handle, &state);
> - if (result)
> + if (result) {
> + mutex_unlock(&resource->resource_lock);
> continue;
> + }
>
> if (state == ACPI_POWER_RESOURCE_STATE_OFF
> && resource->ref_count) {
>
--
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-10-15 20:55 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-10-15 11:48 [PATCH] ACPI/Power: Release resource_lock after acpi_power_get_state() return error Lan Tianyu
2013-10-15 21:06 ` Rafael J. Wysocki
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox