diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-03-28 16:29:51 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-03-28 16:29:51 -0400 |
| commit | ed40d0c472b136682b2fcba05f89762859c7374f (patch) | |
| tree | 076b83a26bcd63d6158463735dd34c10bbc591dc /arch/s390/crypto/prng.c | |
| parent | 9e495834e59ca9b29f1a1f63b9f5533bb022ac49 (diff) | |
| parent | 5d80f8e5a9dc9c9a94d4aeaa567e219a808b8a4a (diff) | |
Merge branch 'origin' into devel
Conflicts:
sound/soc/pxa/pxa2xx-i2s.c
Diffstat (limited to 'arch/s390/crypto/prng.c')
| -rw-r--r-- | arch/s390/crypto/prng.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/s390/crypto/prng.c b/arch/s390/crypto/prng.c index eca724d229ec..b49c00ce65e9 100644 --- a/arch/s390/crypto/prng.c +++ b/arch/s390/crypto/prng.c | |||
| @@ -201,8 +201,7 @@ out_free: | |||
| 201 | static void __exit prng_exit(void) | 201 | static void __exit prng_exit(void) |
| 202 | { | 202 | { |
| 203 | /* wipe me */ | 203 | /* wipe me */ |
| 204 | memset(p->buf, 0, prng_chunk_size); | 204 | kzfree(p->buf); |
| 205 | kfree(p->buf); | ||
| 206 | kfree(p); | 205 | kfree(p); |
| 207 | 206 | ||
| 208 | misc_deregister(&prng_dev); | 207 | misc_deregister(&prng_dev); |