Skip to content

Commit

Permalink
Merge tag 'hwspinlock-3.6-fix' of git://git.kernel.org/pub/scm/linux/…
Browse files Browse the repository at this point in the history
…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
  • Loading branch information
Linus Torvalds committed Sep 18, 2012
2 parents b161dfa + e352614 commit 925a6f0
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion drivers/hwspinlock/hwspinlock_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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 */
Expand Down

0 comments on commit 925a6f0

Please sign in to comment.