diff options
| author | Sergei Shtylyov <sshtylyov@ru.mvista.com> | 2006-03-21 06:01:17 -0500 |
|---|---|---|
| committer | Jaroslav Kysela <perex@suse.cz> | 2006-03-22 04:43:28 -0500 |
| commit | c5c079e31cba3e6f93ef098911e216b79d0a84e8 (patch) | |
| tree | 8879c5322c2e6c2b6b545eb966f40c63a63510f2 | |
| parent | bb160b850d7e285f8b15906d9c0d1916acfdb953 (diff) | |
[ALSA] AMD Au1x00: AC'97 controller is memory mapped
Modules: MIPS AU1x00 driver
AMD Au1x00 ALSA driver erroneously calls request_region() for AC'97
controller registers -- the controller is actually memory mapped at
addresses 0x10000000 thru 0x100FFFFF.
Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
| -rw-r--r-- | sound/mips/au1x00.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sound/mips/au1x00.c b/sound/mips/au1x00.c index 961453b77fc9..cf476fe1ac56 100644 --- a/sound/mips/au1x00.c +++ b/sound/mips/au1x00.c | |||
| @@ -561,12 +561,13 @@ snd_au1000_ac97_new(struct snd_au1000 *au1000) | |||
| 561 | .read = snd_au1000_ac97_read, | 561 | .read = snd_au1000_ac97_read, |
| 562 | }; | 562 | }; |
| 563 | 563 | ||
| 564 | if ((au1000->ac97_res_port = request_region(AC97C_CONFIG, | 564 | if ((au1000->ac97_res_port = request_mem_region(CPHYSADDR(AC97C_CONFIG), |
| 565 | sizeof(struct au1000_ac97_reg), "Au1x00 AC97")) == NULL) { | 565 | 0x100000, "Au1x00 AC97")) == NULL) { |
| 566 | snd_printk(KERN_ERR "ALSA AC97: can't grap AC97 port\n"); | 566 | snd_printk(KERN_ERR "ALSA AC97: can't grap AC97 port\n"); |
| 567 | return -EBUSY; | 567 | return -EBUSY; |
| 568 | } | 568 | } |
| 569 | au1000->ac97_ioport = (struct au1000_ac97_reg *) au1000->ac97_res_port->start; | 569 | au1000->ac97_ioport = (struct au1000_ac97_reg *) |
| 570 | KSEG1ADDR(au1000->ac97_res_port->start); | ||
| 570 | 571 | ||
| 571 | spin_lock_init(&au1000->ac97_lock); | 572 | spin_lock_init(&au1000->ac97_lock); |
| 572 | 573 | ||
