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
This commit is contained in:
commit
f39edadd15
@ -158,10 +158,11 @@ static ssize_t rng_dev_read(struct file *filp, char __user *buf,
|
|||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
out_unlock:
|
|
||||||
mutex_unlock(&rng_mutex);
|
|
||||||
out:
|
out:
|
||||||
return ret ? : err;
|
return ret ? : err;
|
||||||
|
out_unlock:
|
||||||
|
mutex_unlock(&rng_mutex);
|
||||||
|
goto out;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user