aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-12-30 12:36:58 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-12-30 12:36:58 -0800
commitf39edadd1533713a5ed8ba31887ea6c93d137083 (patch)
tree871ba2be5b4500c18a57e944fc954eb144d9ec9b
parent7ea6600148c265b1fd53e521022b1d7aec81d974 (diff)
parentf5908267b67917b8cbd98b27fd2be9b5f62ec76f (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: hwrng: core - Fix double unlock in rng_dev_read
-rw-r--r--drivers/char/hw_random/core.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/char/hw_random/core.c b/drivers/char/hw_random/core.c
index e989f67bb61..3d9c61e5acb 100644
--- a/drivers/char/hw_random/core.c
+++ b/drivers/char/hw_random/core.c
@@ -158,10 +158,11 @@ static ssize_t rng_dev_read(struct file *filp, char __user *buf,
goto out;
}
}
-out_unlock:
- mutex_unlock(&rng_mutex);
out:
return ret ? : err;
+out_unlock:
+ mutex_unlock(&rng_mutex);
+ goto out;
}