diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-06-12 14:50:27 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-06-27 09:23:58 -0700 |
| commit | aa0a2ddc54fa8a22060d17a9ca7bbc4bcc51f260 (patch) | |
| tree | e1d9495b2a21663330e2e02dcc4a038b48e65c49 /sound/pci | |
| parent | 740e518efcd84ce5e53ecf3c4c9be08cf8f3747c (diff) | |
| download | linux-aa0a2ddc54fa8a22060d17a9ca7bbc4bcc51f260.tar.gz linux-aa0a2ddc54fa8a22060d17a9ca7bbc4bcc51f260.tar.bz2 linux-aa0a2ddc54fa8a22060d17a9ca7bbc4bcc51f260.zip | |
[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/pci')
| -rw-r--r-- | sound/pci/bt87x.c | 5 | ||||
| -rw-r--r-- | sound/pci/sonicvibes.c | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/sound/pci/bt87x.c b/sound/pci/bt87x.c index c33642d8d9a1..497ed6b20060 100644 --- a/sound/pci/bt87x.c +++ b/sound/pci/bt87x.c @@ -888,8 +888,9 @@ static int __devinit snd_bt87x_probe(struct pci_dev *pci, strcpy(card->driver, "Bt87x"); sprintf(card->shortname, "Brooktree Bt%x", pci->device); - sprintf(card->longname, "%s at %#lx, irq %i", - card->shortname, pci_resource_start(pci, 0), chip->irq); + sprintf(card->longname, "%s at %#llx, irq %i", + card->shortname, (unsigned long long)pci_resource_start(pci, 0), + chip->irq); strcpy(card->mixername, "Bt87x"); err = snd_card_register(card); diff --git a/sound/pci/sonicvibes.c b/sound/pci/sonicvibes.c index dcf402948347..e5511606af04 100644 --- a/sound/pci/sonicvibes.c +++ b/sound/pci/sonicvibes.c @@ -1441,10 +1441,10 @@ static int __devinit snd_sonic_probe(struct pci_dev *pci, strcpy(card->driver, "SonicVibes"); strcpy(card->shortname, "S3 SonicVibes"); - sprintf(card->longname, "%s rev %i at 0x%lx, irq %i", + sprintf(card->longname, "%s rev %i at 0x%llx, irq %i", card->shortname, sonic->revision, - pci_resource_start(pci, 1), + (unsigned long long)pci_resource_start(pci, 1), sonic->irq); if ((err = snd_sonicvibes_pcm(sonic, 0, NULL)) < 0) { |