| From 46325371b230cc66c743925c930a17e7d0b8211e Mon Sep 17 00:00:00 2001 |
| From: Nicholas Mc Guire <hofrat@osadl.org> |
| Date: Sat, 19 Dec 2015 15:23:13 +0100 |
| Subject: ALSA: oss: consolidate kmalloc/memset 0 call to kzalloc |
| |
| From: Nicholas Mc Guire <hofrat@osadl.org> |
| |
| 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 | 3 +-- |
| 1 file changed, 1 insertion(+), 2 deletions(-) |
| |
| --- a/sound/core/oss/pcm_oss.c |
| +++ b/sound/core/oss/pcm_oss.c |
| @@ -853,7 +853,7 @@ static int snd_pcm_oss_change_params(str |
| 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(str |
| goto failure; |
| } |
| |
| - memset(sw_params, 0, sizeof(*sw_params)); |
| if (runtime->oss.trigger) { |
| sw_params->start_threshold = 1; |
| } else { |
