Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 476a7eeb authored by Shinya Kuribayashi's avatar Shinya Kuribayashi Committed by Ohad Ben-Cohen
Browse files

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



Commit 300bab97 (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: default avatarShinya Kuribayashi <shinya.kuribayashi.px@renesas.com>
[ohad: fix error path of hwspin_lock_register, too]
Signed-off-by: default avatarOhad Ben-Cohen <ohad@wizery.com>
parent 6887a413

drivers/hwspinlock/hwspinlock_core.c

+2 −2
Original line number Diff line number Diff line
@@ -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);