lkml.org 
[lkml]   [2018]   [Apr]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.18 31/52] ALSA: oss: consolidate kmalloc/memset 0 call to kzalloc
    Date
    3.18-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    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 {

    \
     
     \ /
      Last update: 2018-04-22 16:29    [W:5.587 / U:0.420 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site