lkml.org 
[lkml]   [2017]   [May]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 107/164] [media] cx231xx-audio: fix init error path
    Date
    4.9-stable review patch.  If anyone has any objections, please let me know.

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

    From: Johan Hovold <johan@kernel.org>

    commit fff1abc4d54e469140a699612b4db8d6397bfcba upstream.

    Make sure to release the snd_card also on a late allocation error.

    Fixes: e0d3bafd0258 ("V4L/DVB (10954): Add cx231xx USB driver")

    Cc: Sri Deevi <Srinivasa.Deevi@conexant.com>
    Signed-off-by: Johan Hovold <johan@kernel.org>
    Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/media/usb/cx231xx/cx231xx-audio.c | 25 ++++++++++++++-----------
    1 file changed, 14 insertions(+), 11 deletions(-)

    --- a/drivers/media/usb/cx231xx/cx231xx-audio.c
    +++ b/drivers/media/usb/cx231xx/cx231xx-audio.c
    @@ -674,10 +674,8 @@ static int cx231xx_audio_init(struct cx2

    spin_lock_init(&adev->slock);
    err = snd_pcm_new(card, "Cx231xx Audio", 0, 0, 1, &pcm);
    - if (err < 0) {
    - snd_card_free(card);
    - return err;
    - }
    + if (err < 0)
    + goto err_free_card;

    snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE,
    &snd_cx231xx_pcm_capture);
    @@ -691,10 +689,9 @@ static int cx231xx_audio_init(struct cx2
    INIT_WORK(&dev->wq_trigger, audio_trigger);

    err = snd_card_register(card);
    - if (err < 0) {
    - snd_card_free(card);
    - return err;
    - }
    + if (err < 0)
    + goto err_free_card;
    +
    adev->sndcard = card;
    adev->udev = dev->udev;

    @@ -713,9 +710,10 @@ static int cx231xx_audio_init(struct cx2
    "audio EndPoint Addr 0x%x, Alternate settings: %i\n",
    adev->end_point_addr, adev->num_alt);
    adev->alt_max_pkt_size = kmalloc(32 * adev->num_alt, GFP_KERNEL);
    -
    - if (adev->alt_max_pkt_size == NULL)
    - return -ENOMEM;
    + if (!adev->alt_max_pkt_size) {
    + err = -ENOMEM;
    + goto err_free_card;
    + }

    for (i = 0; i < adev->num_alt; i++) {
    u16 tmp =
    @@ -729,6 +727,11 @@ static int cx231xx_audio_init(struct cx2
    }

    return 0;
    +
    +err_free_card:
    + snd_card_free(card);
    +
    + return err;
    }

    static int cx231xx_audio_fini(struct cx231xx *dev)

    \
     
     \ /
      Last update: 2017-05-23 22:31    [W:5.290 / U:0.088 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site