]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[PATCH] i810_audio: fix release_region misordering in error exit from i810_probe
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 4 Aug 2005 18:40:25 +0000 (14:40 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Tue, 23 Aug 2005 05:38:22 +0000 (01:38 -0400)
Re-order release_region calls in i810_probe to properly unwind preceding
allocations.

Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
sound/oss/i810_audio.c

index 7e9f667cf7a7176b15e3b5e24dfda480db54c033..b9a640fe48b10c857867a6c86854a78fee0a73fc 100644 (file)
@@ -3430,9 +3430,9 @@ out_iospace:
                release_mem_region(card->iobase_mmio_phys, 256);
        }
 out_pio:       
-       release_region(card->iobase, 64);
-out_region2:
        release_region(card->ac97base, 256);
+out_region2:
+       release_region(card->iobase, 64);
 out_region1:
        pci_free_consistent(pci_dev, sizeof(struct i810_channel)*NR_HW_CH,
            card->channel, card->chandma);