diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-11-20 10:58:02 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-11-20 10:58:02 -0200 |
| commit | 4bed69bfcb36161bcd89a7a61b6a912c32fea813 (patch) | |
| tree | b40092bb4cc41424343b1a4fd3d90b63f7f01fb3 /linux/sound | |
| parent | f7addb7035dedd9ba701c586fec16b234dde4a77 (diff) | |
| parent | c6f9ed52d0eb5d04c1c65914976d81315a872839 (diff) | |
| download | mediapointer-dvb-s2-4bed69bfcb36161bcd89a7a61b6a912c32fea813.tar.gz mediapointer-dvb-s2-4bed69bfcb36161bcd89a7a61b6a912c32fea813.tar.bz2 | |
merge: http://linuxtv.org/hg/~pinchartl/uvcvideo
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/sound')
| -rw-r--r-- | linux/sound/pci/bt87x.c | 3 |
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; |