3 files changed, 18 insertions, 18 deletions

diff --git a/sound/pci/cs4281.c b/sound/pci/cs4281.c
index 8c150eab45b..e77a4ce314b 100644
--- a/sound/pci/cs4281.c
+++ b/sound/pci/cs4281.c
@@ -1379,6 +1379,13 @@ static int __devinit snd_cs4281_create(struct snd_card *card,
         chip->ba0_addr = pci_resource_start(pci, 0);
         chip->ba1_addr = pci_resource_start(pci, 1);
 
+        chip->ba0 = ioremap_nocache(chip->ba0_addr, pci_resource_len(pci, 0));
+        chip->ba1 = ioremap_nocache(chip->ba1_addr, pci_resource_len(pci, 1));
+        if (!chip->ba0 || !chip->ba1) {
+                snd_cs4281_free(chip);
+                return -ENOMEM;
+        }
+        
         if (request_irq(pci->irq, snd_cs4281_interrupt, SA_INTERRUPT|SA_SHIRQ,
                         "CS4281", chip)) {
                 snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
@@ -1387,13 +1394,6 @@ static int __devinit snd_cs4281_create(struct snd_card *card,
         }
         chip->irq = pci->irq;
 
-        chip->ba0 = ioremap_nocache(chip->ba0_addr, pci_resource_len(pci, 0));
-        chip->ba1 = ioremap_nocache(chip->ba1_addr, pci_resource_len(pci, 1));
-        if (!chip->ba0 || !chip->ba1) {
-                snd_cs4281_free(chip);
-                return -ENOMEM;
-        }
-        
         tmp = snd_cs4281_chip_init(chip);
         if (tmp) {
                 snd_cs4281_free(chip);
diff --git a/sound/pci/rme32.c b/sound/pci/rme32.c
index 4dd53bfe030..2cb9fe98db2 100644
--- a/sound/pci/rme32.c
+++ b/sound/pci/rme32.c
@@ -1368,18 +1368,18 @@ static int __devinit snd_rme32_create(struct rme32 * rme32)
                 return err;
         rme32->port = pci_resource_start(rme32->pci, 0);
 
-        if (request_irq(pci->irq, snd_rme32_interrupt, SA_INTERRUPT | SA_SHIRQ, "RME32", (void *) rme32)) {
-                snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
-                return -EBUSY;
-        }
-        rme32->irq = pci->irq;
-
         if ((rme32->iobase = ioremap_nocache(rme32->port, RME32_IO_SIZE)) == 0) {
                 snd_printk(KERN_ERR "unable to remap memory region 0x%lx-0x%lx\n",
                            rme32->port, rme32->port + RME32_IO_SIZE - 1);
                 return -ENOMEM;
         }
 
+        if (request_irq(pci->irq, snd_rme32_interrupt, SA_INTERRUPT | SA_SHIRQ, "RME32", (void *) rme32)) {
+                snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
+                return -EBUSY;
+        }
+        rme32->irq = pci->irq;
+
         /* read the card's revision number */
         pci_read_config_byte(pci, 8, &rme32->rev);
 
diff --git a/sound/pci/rme96.c b/sound/pci/rme96.c
index 65611a7d366..991cb18c14f 100644
--- a/sound/pci/rme96.c
+++ b/sound/pci/rme96.c
@@ -1583,17 +1583,17 @@ snd_rme96_create(struct rme96 *rme96)
                 return err;
         rme96->port = pci_resource_start(rme96->pci, 0);
 
+        if ((rme96->iobase = ioremap_nocache(rme96->port, RME96_IO_SIZE)) == 0) {
+                snd_printk(KERN_ERR "unable to remap memory region 0x%lx-0x%lx\n", rme96->port, rme96->port + RME96_IO_SIZE - 1);
+                return -ENOMEM;
+        }
+
         if (request_irq(pci->irq, snd_rme96_interrupt, SA_INTERRUPT|SA_SHIRQ, "RME96", (void *)rme96)) {
                 snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
                 return -EBUSY;
         }
         rme96->irq = pci->irq;
 
-        if ((rme96->iobase = ioremap_nocache(rme96->port, RME96_IO_SIZE)) == 0) {
-                snd_printk(KERN_ERR "unable to remap memory region 0x%lx-0x%lx\n", rme96->port, rme96->port + RME96_IO_SIZE - 1);
-                return -ENOMEM;
-        }
-
         /* read the card's revision number */
         pci_read_config_byte(pci, 8, &rme96->rev);