From 70ec4c2ccaffa06ac0f1594707cf622cb4ecf8c1 Mon Sep 17 00:00:00 2001 From: Julia Lawall Date: Mon, 9 Apr 2012 10:16:35 +0200 Subject: [PATCH] --- yaml --- r: 298953 b: refs/heads/master c: 38be95dd3d314bd393a26f6e441ae2c57ef7f064 h: refs/heads/master i: 298951: a096d88e95e6c41196a212d56b6add9c481a5600 v: v3 --- [refs] | 2 +- trunk/sound/isa/sscape.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 6874cff9aa62..540a5e4b70e0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 156d14da4cfc4fe01b705d6e2d22e44c0a2dbecd +refs/heads/master: 38be95dd3d314bd393a26f6e441ae2c57ef7f064 diff --git a/trunk/sound/isa/sscape.c b/trunk/sound/isa/sscape.c index b4a6aa960f4b..8490f59709bb 100644 --- a/trunk/sound/isa/sscape.c +++ b/trunk/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; } /*