leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

Browse Source 
Pull a crypto fix from Herbert Xu:
 "This push fixes another bug in the atmel-rng that made it produce
  completely useless output."

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  hwrng: atmel-rng - fix data valid check
This commit is contained in:
Linus Torvalds 2012-06-18 12:20:36 -07:00
commit 48d4e137ea
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/char/hw_random/atmel-rng.c
View File

@ -34,7 +34,7 @@ static int atmel_trng_read(struct hwrng *rng, void *buf, size_t max,
u32 *data = buf; u32 *data = buf;
/* data ready? */ /* data ready? */
if (readl(trng->base + TRNG_ODATA) & 1) { if (readl(trng->base + TRNG_ISR) & 1) {
*data = readl(trng->base + TRNG_ODATA); *data = readl(trng->base + TRNG_ODATA);
/* /*
ensure data ready is only set again AFTER the next data ensure data ready is only set again AFTER the next data