summaryrefslogtreecommitdiff
path: root/drivers/hwspinlock/hwspinlock_core.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2013-04-19 13:03:08 +0200
committerIngo Molnar <mingo@kernel.org>2013-04-19 13:03:08 +0200
commit5379f8c0d72cab43bbe6d974ceb3ad84dddc2b8e (patch)
tree524d8ac34cc8c7ef68b43e3ee6e08e27db86299c /drivers/hwspinlock/hwspinlock_core.c
parentb6d5278dc8385eaf2e3904a4af444a04f6ae4e71 (diff)
parent94c1acf2c85b03a59a42d931a94a13a76c123a62 (diff)
downloadolio-linux-3.10-5379f8c0d72cab43bbe6d974ceb3ad84dddc2b8e.tar.xz
olio-linux-3.10-5379f8c0d72cab43bbe6d974ceb3ad84dddc2b8e.zip
Merge tag 'edac_amd_f16h' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras into x86/ras
Pull AMD F16h support for amd64_edac from Borislav Petkov. Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/hwspinlock/hwspinlock_core.c')
-rw-r--r--drivers/hwspinlock/hwspinlock_core.c2
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;
}