diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-27 19:36:33 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-27 19:36:33 +0300 |
commit | 31390d0fde1ac9cf47002729660ffd7cd2ae1d75 (patch) | |
tree | 4188ec73c65a182257e6b46e56e8423ad6cbe3b3 /sound/pci/ad1889.c | |
parent | 6634160abfdbac39bd5ebda516b15b078a0f598e (diff) | |
parent | 0a9b86381c76e9d33a9b6edb66aef32d7a3306e3 (diff) | |
download | linux-31390d0fde1ac9cf47002729660ffd7cd2ae1d75.tar.xz |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
ALSA: ASoC: Blackfin: update SPORT0 port selector (v2)
ALSA: hda - Restore default pin configs for realtek codecs
sound: use a common working email address
pci: use pci_ioremap_bar() in sound/
Diffstat (limited to 'sound/pci/ad1889.c')
-rw-r--r-- | sound/pci/ad1889.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/ad1889.c b/sound/pci/ad1889.c index 92f3a976ef2e..a7f38e63303f 100644 --- a/sound/pci/ad1889.c +++ b/sound/pci/ad1889.c @@ -932,7 +932,7 @@ snd_ad1889_create(struct snd_card *card, goto free_and_ret; chip->bar = pci_resource_start(pci, 0); - chip->iobase = ioremap_nocache(chip->bar, pci_resource_len(pci, 0)); + chip->iobase = pci_ioremap_bar(pci, 0); if (chip->iobase == NULL) { printk(KERN_ERR PFX "unable to reserve region.\n"); err = -EBUSY; |