diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-08 18:53:57 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-08 18:53:57 -0700 |
| commit | 84ee9805bc7406bee35f2d62001440c81059f073 (patch) | |
| tree | bbfdb4adce2ee9011ac2c3f266d19d777db1b3c0 /drivers | |
| parent | 76dfee409dea5ef6085c9411b75a482504ee6abd (diff) | |
| parent | c10b90d85a5126d25c89cbaa50dc9fdd1c4d001a (diff) | |
| download | linux-3.10-84ee9805bc7406bee35f2d62001440c81059f073.tar.gz linux-3.10-84ee9805bc7406bee35f2d62001440c81059f073.tar.bz2 linux-3.10-84ee9805bc7406bee35f2d62001440c81059f073.zip | |
Merge tag 'hwspinlock-3.9-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock
Pull a hwspinlock fix from Ohad Ben-Cohen:
"An hwspinlock fix from Li Fei, taking care of a faulty error path."
* tag 'hwspinlock-3.9-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock:
hwspinlock: fix __hwspin_lock_request error path
Diffstat (limited to 'drivers')
| -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 db713c0dfba..461a0d739d7 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; } |