Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 48d4e137 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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
parents 9023a409 c475c06f

drivers/char/hw_random/atmel-rng.c

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ static int atmel_trng_read(struct hwrng *rng, void *buf, size_t max, 
	u32 *data = buf;



	/* data ready? */

	if (readl(trng->base + TRNG_ODATA) & 1) {

	if (readl(trng->base + TRNG_ISR) & 1) {

		*data = readl(trng->base + TRNG_ODATA);

		/*

		  ensure data ready is only set again AFTER the next data