[PATCH 18/72] hwspinlock: fix __hwspin_lock_request error path

Luis Henriques luis.henriques at canonical.com
Thu Apr 18 09:16:03 UTC 2013 -stable review patch.  If anyone has any objections, please let me know.


From: Li Fei <fei.li at intel.com>

commit c10b90d85a5126d25c89cbaa50dc9fdd1c4d001a upstream.

Even in failed case of pm_runtime_get_sync, the usage_count
is incremented. In order to keep the usage_count with correct
value and runtime power management to behave correctly, call
pm_runtime_put_noidle in such case.

In __hwspin_lock_request, module_put is also called before
return in pm_runtime_get_sync failed case.

Signed-off-by Liu Chuansheng <chuansheng.liu at intel.com>
Signed-off-by: Li Fei <fei.li at intel.com>
[edit commit log]
Signed-off-by: Ohad Ben-Cohen <ohad at wizery.com>
Signed-off-by: Luis Henriques <luis.henriques at canonical.com>
 drivers/hwspinlock/hwspinlock_core.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/hwspinlock/hwspinlock_core.c b/drivers/hwspinlock/hwspinlock_core.c
index 1201a15..08e7e72 100644
--- a/drivers/hwspinlock/hwspinlock_core.c
+++ b/drivers/hwspinlock/hwspinlock_core.c
@@ -416,6 +416,8 @@ static int __hwspin_lock_request(struct hwspinlock *hwlock)
 	ret = pm_runtime_get_sync(dev);
 	if (ret < 0) {
 		dev_err(dev, "%s: can't power on device\n", __func__);
+		pm_runtime_put_noidle(dev);
+		module_put(dev->driver->owner);
 		return ret;

More information about the kernel-team mailing list