diff options
| author | Takashi Iwai <tiwai@suse.de> | 2008-12-01 18:02:17 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-12-01 18:02:17 +0100 |
| commit | 3af4182cc5be7d5505f9801ee3297373f1872446 (patch) | |
| tree | 214348d40ed547a72f9612a7e5c94a01afded812 /sound/pci/cs4281.c | |
| parent | f5d4c67e41a262f0cdfaec1bb0fa8e5952187ef9 (diff) | |
| parent | c07f62e5f18123103459ff74e86af1518a5b8af5 (diff) | |
| download | kernel_samsung_crespo-3af4182cc5be7d5505f9801ee3297373f1872446.zip kernel_samsung_crespo-3af4182cc5be7d5505f9801ee3297373f1872446.tar.gz kernel_samsung_crespo-3af4182cc5be7d5505f9801ee3297373f1872446.tar.bz2 | |
Merge branch 'upstream' into topic/asoc
Diffstat (limited to 'sound/pci/cs4281.c')
| -rw-r--r-- | sound/pci/cs4281.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/cs4281.c b/sound/pci/cs4281.c index ef9308f..192e784 100644 --- a/sound/pci/cs4281.c +++ b/sound/pci/cs4281.c @@ -1382,8 +1382,8 @@ static int __devinit snd_cs4281_create(struct snd_card *card, chip->ba0_addr = pci_resource_start(pci, 0); chip->ba1_addr = pci_resource_start(pci, 1); - chip->ba0 = ioremap_nocache(chip->ba0_addr, pci_resource_len(pci, 0)); - chip->ba1 = ioremap_nocache(chip->ba1_addr, pci_resource_len(pci, 1)); + chip->ba0 = pci_ioremap_bar(pci, 0); + chip->ba1 = pci_ioremap_bar(pci, 1); if (!chip->ba0 || !chip->ba1) { snd_cs4281_free(chip); return -ENOMEM; |