summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2010-08-09 10:29:28 -0400
committerHerbert Xu <herbert@gondor.apana.org.au>2010-08-09 10:29:28 -0400
commit50b6e71ae83714be509b80727dbf90fa8b1c0717 (patch)
tree6f5c2651c763606c8c6659de5b8fd7c05ddd78d5
parent00ca28a507b215dcd121735f16764ea4173c4ff9 (diff)
downloadlinux-50b6e71ae83714be509b80727dbf90fa8b1c0717.tar.gz
linux-50b6e71ae83714be509b80727dbf90fa8b1c0717.tar.bz2
linux-50b6e71ae83714be509b80727dbf90fa8b1c0717.zip
Revert "hwrng: n2-drv - remove casts from void*"
This reverts commit 8b9cfdca9c52f7d39c3ccfac1668e31c20c9f42e. This patch needs to wait for the HWRNG API to start using void * for priv first. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-rw-r--r--drivers/char/hw_random/n2-drv.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/hw_random/n2-drv.c b/drivers/char/hw_random/n2-drv.c
index 7a4f080f8356..d8a4ca87987d 100644
--- a/drivers/char/hw_random/n2-drv.c
+++ b/drivers/char/hw_random/n2-drv.c
@@ -387,7 +387,7 @@ static int n2rng_init_control(struct n2rng *np)
static int n2rng_data_read(struct hwrng *rng, u32 *data)
{
- struct n2rng *np = rng->priv;
+ struct n2rng *np = (struct n2rng *) rng->priv;
unsigned long ra = __pa(&np->test_data);
int len;