Merge branch 'topic/pcsp-fix' into topic/misc
[sfrench/cifs-2.6.git] / sound / pci / mixart / mixart.c
index fd9a117f37a42649cf237b008988c9ce7b9bb922..f23a73577c2219cb7da2b03317bf1106b7e1f981 100644 (file)
@@ -1315,8 +1315,7 @@ static int __devinit snd_mixart_probe(struct pci_dev *pci,
        }
        for (i = 0; i < 2; i++) {
                mgr->mem[i].phys = pci_resource_start(pci, i);
-               mgr->mem[i].virt = ioremap_nocache(mgr->mem[i].phys,
-                                                  pci_resource_len(pci, i));
+               mgr->mem[i].virt = pci_ioremap_bar(pci, i);
                if (!mgr->mem[i].virt) {
                        printk(KERN_ERR "unable to remap resource 0x%lx\n",
                               mgr->mem[i].phys);