diff options
| author | Li Fei <fei.li@intel.com> | 2013-04-05 21:20:36 +0800 |
|---|---|---|
| committer | Ohad Ben-Cohen <ohad@wizery.com> | 2013-04-05 17:45:11 +0300 |
| commit | c10b90d85a5126d25c89cbaa50dc9fdd1c4d001a (patch) | |
| tree | 8a865e3c2407457a890f8e1f9257fb780282d922 /drivers/hwspinlock | |
| parent | f6161aa153581da4a3867a2d1a7caf4be19b6ec9 (diff) | |
| download | kernel-common-c10b90d85a5126d25c89cbaa50dc9fdd1c4d001a.tar.gz kernel-common-c10b90d85a5126d25c89cbaa50dc9fdd1c4d001a.tar.bz2 kernel-common-c10b90d85a5126d25c89cbaa50dc9fdd1c4d001a.zip | |
hwspinlock: fix __hwspin_lock_request error path
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.
Cc: stable@vger.kernel.org
Signed-off-by Liu Chuansheng <chuansheng.liu@intel.com>
Signed-off-by: Li Fei <fei.li@intel.com>
[edit commit log]
Signed-off-by: Ohad Ben-Cohen <ohad@wizery.com>
Diffstat (limited to 'drivers/hwspinlock')
| -rw-r--r-- | drivers/hwspinlock/hwspinlock_core.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/hwspinlock/hwspinlock_core.c b/drivers/hwspinlock/hwspinlock_core.c index db713c0dfba4..461a0d739d75 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; } |