Merge branches 'topic/fix/asoc', 'topic/fix/hda', 'topic/fix/misc' and 'topic/pci-ioremap-bar' into for-linus
This commit is contained in:
@@ -2,7 +2,7 @@
|
||||
* cs5530.c - Initialisation code for Cyrix/NatSemi VSA1 softaudio
|
||||
*
|
||||
* (C) Copyright 2007 Ash Willis <ashwillis@programmer.net>
|
||||
* (C) Copyright 2003 Red Hat Inc <alan@redhat.com>
|
||||
* (C) Copyright 2003 Red Hat Inc <alan@lxorguk.ukuu.org.uk>
|
||||
*
|
||||
* This driver was ported (shamelessly ripped ;) from oss/kahlua.c but I did
|
||||
* mess with it a bit. The chip seems to have to have trouble with full duplex
|
||||
@@ -132,7 +132,7 @@ static int __devinit snd_cs5530_create(struct snd_card *card,
|
||||
}
|
||||
chip->pci_base = pci_resource_start(pci, 0);
|
||||
|
||||
mem = ioremap_nocache(chip->pci_base, pci_resource_len(pci, 0));
|
||||
mem = pci_ioremap_bar(pci, 0);
|
||||
if (mem == NULL) {
|
||||
kfree(chip);
|
||||
pci_disable_device(pci);
|
||||
|
Reference in New Issue
Block a user