summaryrefslogtreecommitdiff
path: root/linux/sound
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2008-11-11 07:39:53 -0200
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-11-11 07:39:53 -0200
commit44fb259c62c95f15516f65a961483476ad226ff6 (patch)
treef21dc593a3bae6bdc39109a22f784deae3087dc2 /linux/sound
parent28615ed3424329580117e65a34106ca408bf564b (diff)
downloadmediapointer-dvb-s2-44fb259c62c95f15516f65a961483476ad226ff6.tar.gz
mediapointer-dvb-s2-44fb259c62c95f15516f65a961483476ad226ff6.tar.bz2
Backport a few minor changes from upstream
From: Mauro Carvalho Chehab <mchehab@redhat.com> kernel-sync: Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/sound')
-rw-r--r--linux/sound/pci/bt87x.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/linux/sound/pci/bt87x.c b/linux/sound/pci/bt87x.c
index 0dd872610..8b6868462 100644
--- a/linux/sound/pci/bt87x.c
+++ b/linux/sound/pci/bt87x.c
@@ -775,8 +775,7 @@ static int __devinit snd_bt87x_create(struct snd_card *card,
pci_disable_device(pci);
return err;
}
- chip->mmio = ioremap_nocache(pci_resource_start(pci, 0),
- pci_resource_len(pci, 0));
+ chip->mmio = pci_ioremap_bar(pci, 0);
if (!chip->mmio) {
snd_printk(KERN_ERR "cannot remap io memory\n");
err = -ENOMEM;