diff options
author | Takashi Iwai <tiwai@suse.de> | 2008-12-20 17:39:47 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2008-12-20 17:39:47 -0500 |
commit | 55fa518867978e1f5fd8353098f80d125ac734d7 (patch) | |
tree | 3502b331c1f9ec4cac25dc8ba30b6a0a324e350c /sound/pci/mixart | |
parent | bb1f24bf00a85f666b56a09b7cdbfd221af16c2c (diff) | |
parent | eea0579fc85e64e9f05361d5aacf496fe7a151aa (diff) |
Merge branch 'topic/pcsp-fix' into topic/misc
Diffstat (limited to 'sound/pci/mixart')
-rw-r--r-- | sound/pci/mixart/mixart.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/pci/mixart/mixart.c b/sound/pci/mixart/mixart.c index fd9a117f37a4..f23a73577c22 100644 --- a/sound/pci/mixart/mixart.c +++ b/sound/pci/mixart/mixart.c | |||
@@ -1315,8 +1315,7 @@ static int __devinit snd_mixart_probe(struct pci_dev *pci, | |||
1315 | } | 1315 | } |
1316 | for (i = 0; i < 2; i++) { | 1316 | for (i = 0; i < 2; i++) { |
1317 | mgr->mem[i].phys = pci_resource_start(pci, i); | 1317 | mgr->mem[i].phys = pci_resource_start(pci, i); |
1318 | mgr->mem[i].virt = ioremap_nocache(mgr->mem[i].phys, | 1318 | mgr->mem[i].virt = pci_ioremap_bar(pci, i); |
1319 | pci_resource_len(pci, i)); | ||
1320 | if (!mgr->mem[i].virt) { | 1319 | if (!mgr->mem[i].virt) { |
1321 | printk(KERN_ERR "unable to remap resource 0x%lx\n", | 1320 | printk(KERN_ERR "unable to remap resource 0x%lx\n", |
1322 | mgr->mem[i].phys); | 1321 | mgr->mem[i].phys); |