lkml.org 
[lkml]   [2012]   [Apr]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] sound/isa/sscape.c: add missing resource-release code
    Date
    From: Julia Lawall <Julia.Lawall@lip6.fr>

    At the point of this error-handling code, both regions and the dma have
    been allocated, so free it as done in previous and subsequent
    error-handling code.

    Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>

    ---
    sound/isa/sscape.c | 6 ++++--
    1 file changed, 4 insertions(+), 2 deletions(-)

    diff --git a/sound/isa/sscape.c b/sound/isa/sscape.c
    index b4a6aa9..131dd98 100644
    --- a/sound/isa/sscape.c
    +++ b/sound/isa/sscape.c
    @@ -1019,13 +1019,15 @@ static int __devinit create_sscape(int dev, struct snd_card *card)
    irq_cfg = get_irq_config(sscape->type, irq[dev]);
    if (irq_cfg == INVALID_IRQ) {
    snd_printk(KERN_ERR "sscape: Invalid IRQ %d\n", irq[dev]);
    - return -ENXIO;
    + err = -ENXIO;
    + goto _release_dma;
    }

    mpu_irq_cfg = get_irq_config(sscape->type, mpu_irq[dev]);
    if (mpu_irq_cfg == INVALID_IRQ) {
    snd_printk(KERN_ERR "sscape: Invalid IRQ %d\n", mpu_irq[dev]);
    - return -ENXIO;
    + err = -ENXIO;
    + goto _release_dma;
    }

    /*


    \
     
     \ /
      Last update: 2012-04-09 10:19    [W:0.027 / U:0.008 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site