lkml.org 
[lkml]   [2016]   [Oct]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH 03/18] [media] RedRat3: Return directly after a failed kcalloc() in redrat3_transmit_ir()
    From
    Date
    From: Markus Elfring <elfring@users.sourceforge.net>
    Date: Thu, 13 Oct 2016 10:34:29 +0200

    * Return directly after a call of the function "kcalloc" failed
    at the beginning.

    * Reorder two calls for the function "kfree" at the end.

    Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
    ---
    drivers/media/rc/redrat3.c | 8 +++-----
    1 file changed, 3 insertions(+), 5 deletions(-)

    diff --git a/drivers/media/rc/redrat3.c b/drivers/media/rc/redrat3.c
    index f5a6850..7ae2ced 100644
    --- a/drivers/media/rc/redrat3.c
    +++ b/drivers/media/rc/redrat3.c
    @@ -741,10 +741,8 @@ static int redrat3_transmit_ir(struct rc_dev *rcdev, unsigned *txbuf,
    sample_lens = kcalloc(RR3_DRIVER_MAXLENS,
    sizeof(*sample_lens),
    GFP_KERNEL);
    - if (!sample_lens) {
    - ret = -ENOMEM;
    - goto out;
    - }
    + if (!sample_lens)
    + return -ENOMEM;

    irdata = kzalloc(sizeof(*irdata), GFP_KERNEL);
    if (!irdata) {
    @@ -815,8 +813,8 @@ static int redrat3_transmit_ir(struct rc_dev *rcdev, unsigned *txbuf,
    ret = count;

    out:
    - kfree(sample_lens);
    kfree(irdata);
    + kfree(sample_lens);

    rr3->transmitting = false;
    /* rr3 re-enables rc detector because it was enabled before */
    --
    2.10.1
    \
     
     \ /
      Last update: 2016-10-13 18:32    [W:3.880 / U:3.452 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site