diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-09 13:22:40 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-09 13:22:40 -0700 |
| commit | 17cda2082db413355a12bfeb1d1e98308ab0d095 (patch) | |
| tree | d8350a577fff19cdcae931985ef42943d9efbd9b | |
| parent | 17fae1cdea2fd131984facfb24923a3eb78c63d0 (diff) | |
| parent | 476a7eeb60e70ddab138e7cb4bc44ef5ac20782e (diff) | |
| download | blockconsole-17cda2082db413355a12bfeb1d1e98308ab0d095.tar.gz | |
Merge tag 'hwspinlock-3.5-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock
Pull hwspinlock fix from Ohad Ben-Cohen:
"A single hwspinlock core fix for multiple hwspinlock devices
scenarios, from Shinya Kuribayashi."
* tag 'hwspinlock-3.5-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock:
hwspinlock/core: use global ID to register hwspinlocks on multiple devices
| -rw-r--r-- | drivers/hwspinlock/hwspinlock_core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/hwspinlock/hwspinlock_core.c b/drivers/hwspinlock/hwspinlock_core.c index 61c9cf15fa52e..1201a15784c3a 100644 --- a/drivers/hwspinlock/hwspinlock_core.c +++ b/drivers/hwspinlock/hwspinlock_core.c @@ -345,7 +345,7 @@ int hwspin_lock_register(struct hwspinlock_device *bank, struct device *dev, spin_lock_init(&hwlock->lock); hwlock->bank = bank; - ret = hwspin_lock_register_single(hwlock, i); + ret = hwspin_lock_register_single(hwlock, base_id + i); if (ret) goto reg_failed; } @@ -354,7 +354,7 @@ int hwspin_lock_register(struct hwspinlock_device *bank, struct device *dev, reg_failed: while (--i >= 0) - hwspin_lock_unregister_single(i); + hwspin_lock_unregister_single(base_id + i); return ret; } EXPORT_SYMBOL_GPL(hwspin_lock_register); |