diff options
| author | Takashi Iwai <tiwai@suse.de> | 2008-12-19 02:22:57 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-12-19 02:22:57 -0500 |
| commit | 0ff555192a8d20385d49d1c420e2e8d409b3c0da (patch) | |
| tree | b6e4b6cae1028a310a3488ebf745954c51694bfc /sound/pci/cs4281.c | |
| parent | 3218c178b41b420cb7e0d120c7a137a3969242e5 (diff) | |
| parent | 9e43f0de690211cf7153b5f3ec251bc315647ada (diff) | |
Merge branch 'fix/hda' into topic/hda
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 ef9308f7c45b..192e7842e181 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, | |||
| 1382 | chip->ba0_addr = pci_resource_start(pci, 0); | 1382 | chip->ba0_addr = pci_resource_start(pci, 0); |
| 1383 | chip->ba1_addr = pci_resource_start(pci, 1); | 1383 | chip->ba1_addr = pci_resource_start(pci, 1); |
| 1384 | 1384 | ||
| 1385 | chip->ba0 = ioremap_nocache(chip->ba0_addr, pci_resource_len(pci, 0)); | 1385 | chip->ba0 = pci_ioremap_bar(pci, 0); |
| 1386 | chip->ba1 = ioremap_nocache(chip->ba1_addr, pci_resource_len(pci, 1)); | 1386 | chip->ba1 = pci_ioremap_bar(pci, 1); |
| 1387 | if (!chip->ba0 || !chip->ba1) { | 1387 | if (!chip->ba0 || !chip->ba1) { |
| 1388 | snd_cs4281_free(chip); | 1388 | snd_cs4281_free(chip); |
| 1389 | return -ENOMEM; | 1389 | return -ENOMEM; |