[PATCH] OSS: replace kmalloc()+memset() combos with kzalloc()

Replace kmalloc() + memset() pairs with the appropriate kzalloc() calls.

Signed-off-by: Robert P. J. Day <rpjday@mindspring.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 1 insertions, 3 deletions

diff --git a/sound/oss/waveartist.c b/sound/oss/waveartist.c
index 26a7c6af95bc..b48c72923a13 100644
--- a/sound/oss/waveartist.c
+++ b/sound/oss/waveartist.c
@@ -1267,12 +1267,10 @@ static int __init waveartist_init(wavnc_info *devc)
         conf_printf2(dev_name, devc->hw.io_base, devc->hw.irq,
                      devc->hw.dma, devc->hw.dma2);
 
-        portc = kmalloc(sizeof(wavnc_port_info), GFP_KERNEL);
+        portc = kzalloc(sizeof(wavnc_port_info), GFP_KERNEL);
         if (portc == NULL)
                 goto nomem;
 
-        memset(portc, 0, sizeof(wavnc_port_info));
-
         my_dev = sound_install_audiodrv(AUDIO_DRIVER_VERSION, dev_name,
                         &waveartist_audio_driver, sizeof(struct audio_driver),
                         devc->audio_flags, AFMT_U8 | AFMT_S16_LE | AFMT_S8,