diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-03-24 00:35:50 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-03-24 00:35:50 +0100 |
| commit | e0d2054fd3cf167395390dc1758644486c782707 (patch) | |
| tree | 108fd3138f0246f5fa17454680d6d04a670ed6d8 /sound/sparc | |
| parent | d807500a2472445d05ce641bf09438e3d72eeb4f (diff) | |
| parent | c468ac29e63b9927275a94379d00b367f0f97c43 (diff) | |
| download | op-kernel-dev-e0d2054fd3cf167395390dc1758644486c782707.zip op-kernel-dev-e0d2054fd3cf167395390dc1758644486c782707.tar.gz | |
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'sound/sparc')
| -rw-r--r-- | sound/sparc/amd7930.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/sparc/amd7930.c b/sound/sparc/amd7930.c index ba38912..574af56 100644 --- a/sound/sparc/amd7930.c +++ b/sound/sparc/amd7930.c @@ -954,7 +954,8 @@ static int __devinit snd_amd7930_create(struct snd_card *card, amd->regs = of_ioremap(&op->resource[0], 0, resource_size(&op->resource[0]), "amd7930"); if (!amd->regs) { - snd_printk("amd7930-%d: Unable to map chip registers.\n", dev); + snd_printk(KERN_ERR + "amd7930-%d: Unable to map chip registers.\n", dev); return -EIO; } @@ -962,7 +963,7 @@ static int __devinit snd_amd7930_create(struct snd_card *card, if (request_irq(irq, snd_amd7930_interrupt, IRQF_DISABLED | IRQF_SHARED, "amd7930", amd)) { - snd_printk("amd7930-%d: Unable to grab IRQ %d\n", + snd_printk(KERN_ERR "amd7930-%d: Unable to grab IRQ %d\n", dev, irq); snd_amd7930_free(amd); return -EBUSY; |
