]> git.ipfire.org Git - thirdparty/kernel/stable.git/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)
committerSasha Levin <alexander.levin@microsoft.com>
Wed, 23 May 2018 01:36:34 +0000 (21:36 -0400)
[ Upstream commit 46325371b230cc66c743925c930a17e7d0b8211e ]

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: Sasha Levin <alexander.levin@microsoft.com>
sound/core/oss/pcm_oss.c

index daa1feac66bf7ba73acbad68cad9ee174a374c9f..001f4526be8d94e375155842a7f6b808335d0406 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) {
@@ -991,7 +991,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 {