aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/hda/hda_intel.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2008-12-19 02:22:57 -0500
committerTakashi Iwai <tiwai@suse.de>2008-12-19 02:22:57 -0500
commit0ff555192a8d20385d49d1c420e2e8d409b3c0da (patch)
treeb6e4b6cae1028a310a3488ebf745954c51694bfc /sound/pci/hda/hda_intel.c
parent3218c178b41b420cb7e0d120c7a137a3969242e5 (diff)
parent9e43f0de690211cf7153b5f3ec251bc315647ada (diff)
Merge branch 'fix/hda' into topic/hda
Diffstat (limited to 'sound/pci/hda/hda_intel.c')
-rw-r--r--sound/pci/hda/hda_intel.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index f2337e4eddda..a26ae8c4cf70 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -2182,7 +2182,7 @@ static int __devinit azx_create(struct snd_card *card, struct pci_dev *pci,
2182 } 2182 }
2183 2183
2184 chip->addr = pci_resource_start(pci, 0); 2184 chip->addr = pci_resource_start(pci, 0);
2185 chip->remap_addr = ioremap_nocache(chip->addr, pci_resource_len(pci,0)); 2185 chip->remap_addr = pci_ioremap_bar(pci, 0);
2186 if (chip->remap_addr == NULL) { 2186 if (chip->remap_addr == NULL) {
2187 snd_printk(KERN_ERR SFX "ioremap error\n"); 2187 snd_printk(KERN_ERR SFX "ioremap error\n");
2188 err = -ENXIO; 2188 err = -ENXIO;