]> git.hungrycats.org Git - linux/commitdiff
ALSA: oss: consolidate kmalloc/memset 0 call to kzalloc
authorNicholas Mc Guire <hofrat@osadl.org>
Sat, 19 Dec 2015 14:23:13 +0000 (15:23 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 24 Apr 2018 07:29:27 +0000 (09:29 +0200)
commit 46325371b230cc66c743925c930a17e7d0b8211e upstream.

This is an API consolidation only. The use of kmalloc + memset to 0
is equivalent to kzalloc.

Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
sound/core/oss/pcm_oss.c

index 520c6bed5d2b74f2d78a219e4481195e3b732049..fb3431a160d2f31b89ae8a316eed97015d7f333a 100644 (file)
@@ -853,7 +853,7 @@ static int snd_pcm_oss_change_params(struct snd_pcm_substream *substream,
                        return -EAGAIN;
        } else if (mutex_lock_interruptible(&runtime->oss.params_lock))
                return -EINTR;
-       sw_params = kmalloc(sizeof(*sw_params), GFP_KERNEL);
+       sw_params = kzalloc(sizeof(*sw_params), GFP_KERNEL);
        params = kmalloc(sizeof(*params), GFP_KERNEL);
        sparams = kmalloc(sizeof(*sparams), GFP_KERNEL);
        if (!sw_params || !params || !sparams) {
@@ -992,7 +992,6 @@ static int snd_pcm_oss_change_params(struct snd_pcm_substream *substream,
                goto failure;
        }
 
-       memset(sw_params, 0, sizeof(*sw_params));
        if (runtime->oss.trigger) {
                sw_params->start_threshold = 1;
        } else {