lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

hwspinlock/core: use global ID to register hwspinlocks on multiple devices

Browse Source 
Commit 300bab9770 (hwspinlock/core: register a bank of hwspinlocks in a
single API call, 2011-09-06) introduced 'hwspin_lock_register_single()'
to register numerous (a bank of) hwspinlock instances in a single API,
'hwspin_lock_register()'.

At which time, 'hwspin_lock_register()' accidentally passes 'local IDs'
to 'hwspin_lock_register_single()', despite that ..._single() requires
'global IDs' to register hwspinlocks.

We have to convert into global IDs by supplying the missing 'base_id'.

Cc: stable <stable@vger.kernel.org>
Signed-off-by: Shinya Kuribayashi <shinya.kuribayashi.px@renesas.com>
[ohad: fix error path of hwspin_lock_register, too]
Signed-off-by: Ohad Ben-Cohen <ohad@wizery.com>
This commit is contained in:
Shinya Kuribayashi
2012-07-07 13:37:42 +03:00
committed by Ohad Ben-Cohen
parent 6887a4131d
commit 476a7eeb60
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/hwspinlock/hwspinlock_core.c
View File

@@ -345,7 +345,7 @@ int hwspin_lock_register(struct hwspinlock_device *bank, struct device *dev,
spin_lock_init(&hwlock->lock); spin_lock_init(&hwlock->lock);
hwlock->bank = bank; hwlock->bank = bank;
ret = hwspin_lock_register_single(hwlock, i); ret = hwspin_lock_register_single(hwlock, base_id + i);
if (ret) if (ret)
goto reg_failed; goto reg_failed;
} }
@@ -354,7 +354,7 @@ int hwspin_lock_register(struct hwspinlock_device *bank, struct device *dev,
reg_failed: reg_failed:
while (--i >= 0) while (--i >= 0)
hwspin_lock_unregister_single(i); hwspin_lock_unregister_single(base_id + i);
return ret; return ret;
} }
EXPORT_SYMBOL_GPL(hwspin_lock_register); EXPORT_SYMBOL_GPL(hwspin_lock_register);