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
git-mirror · Dec 30, 2009 · f39edad · f39edad
2 parents 7ea6600 + f590826
commit f39edad
Showing 1 changed file with 3 additions and 2 deletions.
diff --git 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;
 }