diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-06-12 17:50:27 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-06-27 12:23:58 -0400 |
commit | aa0a2ddc54fa8a22060d17a9ca7bbc4bcc51f260 (patch) | |
tree | e1d9495b2a21663330e2e02dcc4a038b48e65c49 /sound/isa | |
parent | 740e518efcd84ce5e53ecf3c4c9be08cf8f3747c (diff) |
[PATCH] 64bit resource: fix up printks for resources in sound drivers
This is needed if we wish to change the size of the resource structures.
Based on an original patch from Vivek Goyal <vgoyal@in.ibm.com>
Cc: Vivek Goyal <vgoyal@in.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'sound/isa')
-rw-r--r-- | sound/isa/es18xx.c | 3 | ||||
-rw-r--r-- | sound/isa/gus/interwave.c | 8 | ||||
-rw-r--r-- | sound/isa/sb/sb16.c | 3 |
3 files changed, 8 insertions, 6 deletions
diff --git a/sound/isa/es18xx.c b/sound/isa/es18xx.c index e6945db8ed1b..af60b0bc8115 100644 --- a/sound/isa/es18xx.c +++ b/sound/isa/es18xx.c | |||
@@ -2088,7 +2088,8 @@ static int __devinit snd_audiodrive_pnp(int dev, struct snd_audiodrive *acard, | |||
2088 | kfree(cfg); | 2088 | kfree(cfg); |
2089 | return -EAGAIN; | 2089 | return -EAGAIN; |
2090 | } | 2090 | } |
2091 | snd_printdd("pnp: port=0x%lx\n", pnp_port_start(acard->devc, 0)); | 2091 | snd_printdd("pnp: port=0x%llx\n", |
2092 | (unsigned long long)pnp_port_start(acard->devc, 0)); | ||
2092 | /* PnP initialization */ | 2093 | /* PnP initialization */ |
2093 | pdev = acard->dev; | 2094 | pdev = acard->dev; |
2094 | pnp_init_resource_table(cfg); | 2095 | pnp_init_resource_table(cfg); |
diff --git a/sound/isa/gus/interwave.c b/sound/isa/gus/interwave.c index 866300f2acbb..c1c86e0fa56d 100644 --- a/sound/isa/gus/interwave.c +++ b/sound/isa/gus/interwave.c | |||
@@ -611,10 +611,10 @@ static int __devinit snd_interwave_pnp(int dev, struct snd_interwave *iwcard, | |||
611 | if (dma2[dev] >= 0) | 611 | if (dma2[dev] >= 0) |
612 | dma2[dev] = pnp_dma(pdev, 1); | 612 | dma2[dev] = pnp_dma(pdev, 1); |
613 | irq[dev] = pnp_irq(pdev, 0); | 613 | irq[dev] = pnp_irq(pdev, 0); |
614 | snd_printdd("isapnp IW: sb port=0x%lx, gf1 port=0x%lx, codec port=0x%lx\n", | 614 | snd_printdd("isapnp IW: sb port=0x%llx, gf1 port=0x%llx, codec port=0x%llx\n", |
615 | pnp_port_start(pdev, 0), | 615 | (unsigned long long)pnp_port_start(pdev, 0), |
616 | pnp_port_start(pdev, 1), | 616 | (unsigned long long)pnp_port_start(pdev, 1), |
617 | pnp_port_start(pdev, 2)); | 617 | (unsigned long long)pnp_port_start(pdev, 2)); |
618 | snd_printdd("isapnp IW: dma1=%i, dma2=%i, irq=%i\n", dma1[dev], dma2[dev], irq[dev]); | 618 | snd_printdd("isapnp IW: dma1=%i, dma2=%i, irq=%i\n", dma1[dev], dma2[dev], irq[dev]); |
619 | #ifdef SNDRV_STB | 619 | #ifdef SNDRV_STB |
620 | /* Tone Control initialization */ | 620 | /* Tone Control initialization */ |
diff --git a/sound/isa/sb/sb16.c b/sound/isa/sb/sb16.c index 7f7f05fa518a..d64e67f2bafa 100644 --- a/sound/isa/sb/sb16.c +++ b/sound/isa/sb/sb16.c | |||
@@ -327,7 +327,8 @@ static int __devinit snd_card_sb16_pnp(int dev, struct snd_card_sb16 *acard, | |||
327 | goto __wt_error; | 327 | goto __wt_error; |
328 | } | 328 | } |
329 | awe_port[dev] = pnp_port_start(pdev, 0); | 329 | awe_port[dev] = pnp_port_start(pdev, 0); |
330 | snd_printdd("pnp SB16: wavetable port=0x%lx\n", pnp_port_start(pdev, 0)); | 330 | snd_printdd("pnp SB16: wavetable port=0x%llx\n", |
331 | (unsigned long long)pnp_port_start(pdev, 0)); | ||
331 | } else { | 332 | } else { |
332 | __wt_error: | 333 | __wt_error: |
333 | if (pdev) { | 334 | if (pdev) { |