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

Commit 17cda208 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 17fae1cd 476a7eeb

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);