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

Commit 925a6f0b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'hwspinlock-3.6-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock 

Pull hwspinlock fix from Ohad Ben-Cohen:
 "A single hwspinlock fix by Wei Yongjun, which prevents potential NULL
  dereferences"

* tag 'hwspinlock-3.6-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock:
  hwspinlock/core: move the dereference below the NULL test
parents b161dfa6 e352614c

drivers/hwspinlock/hwspinlock_core.c

+2 −1
Original line number Diff line number Diff line
@@ -552,7 +552,7 @@ EXPORT_SYMBOL_GPL(hwspin_lock_request_specific); 
 */

int hwspin_lock_free(struct hwspinlock *hwlock)

{

	struct device *dev = hwlock->bank->dev;

	struct device *dev;

	struct hwspinlock *tmp;

	int ret;
@@ -561,6 +561,7 @@ int hwspin_lock_free(struct hwspinlock *hwlock) 
		return -EINVAL;

	}



	dev = hwlock->bank->dev;

	mutex_lock(&hwspinlock_tree_lock);



	/* make sure the hwspinlock is used */