From 4c1c73661d92797b501bad3d5b00d605a8fa16d3 Mon Sep 17 00:00:00 2001 From: Sergei Shtylyov Date: Tue, 21 Mar 2006 12:01:17 +0100 Subject: [PATCH] --- yaml --- r: 22800 b: refs/heads/master c: c5c079e31cba3e6f93ef098911e216b79d0a84e8 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/mips/au1x00.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 33fa9a6dc03f..a0ab7d74c2f8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bb160b850d7e285f8b15906d9c0d1916acfdb953 +refs/heads/master: c5c079e31cba3e6f93ef098911e216b79d0a84e8 diff --git a/trunk/sound/mips/au1x00.c b/trunk/sound/mips/au1x00.c index 961453b77fc9..cf476fe1ac56 100644 --- a/trunk/sound/mips/au1x00.c +++ b/trunk/sound/mips/au1x00.c @@ -561,12 +561,13 @@ snd_au1000_ac97_new(struct snd_au1000 *au1000) .read = snd_au1000_ac97_read, }; - if ((au1000->ac97_res_port = request_region(AC97C_CONFIG, - sizeof(struct au1000_ac97_reg), "Au1x00 AC97")) == NULL) { + if ((au1000->ac97_res_port = request_mem_region(CPHYSADDR(AC97C_CONFIG), + 0x100000, "Au1x00 AC97")) == NULL) { snd_printk(KERN_ERR "ALSA AC97: can't grap AC97 port\n"); return -EBUSY; } - au1000->ac97_ioport = (struct au1000_ac97_reg *) au1000->ac97_res_port->start; + au1000->ac97_ioport = (struct au1000_ac97_reg *) + KSEG1ADDR(au1000->ac97_res_port->start); spin_lock_init(&au1000->ac97_lock);