diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-03-23 19:35:50 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-03-23 19:35:50 -0400 |
commit | e0d2054fd3cf167395390dc1758644486c782707 (patch) | |
tree | 108fd3138f0246f5fa17454680d6d04a670ed6d8 /sound/sparc | |
parent | d807500a2472445d05ce641bf09438e3d72eeb4f (diff) | |
parent | c468ac29e63b9927275a94379d00b367f0f97c43 (diff) |
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 ba38912614b4..574af56ba8a6 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, | |||
954 | amd->regs = of_ioremap(&op->resource[0], 0, | 954 | amd->regs = of_ioremap(&op->resource[0], 0, |
955 | resource_size(&op->resource[0]), "amd7930"); | 955 | resource_size(&op->resource[0]), "amd7930"); |
956 | if (!amd->regs) { | 956 | if (!amd->regs) { |
957 | snd_printk("amd7930-%d: Unable to map chip registers.\n", dev); | 957 | snd_printk(KERN_ERR |
958 | "amd7930-%d: Unable to map chip registers.\n", dev); | ||
958 | return -EIO; | 959 | return -EIO; |
959 | } | 960 | } |
960 | 961 | ||
@@ -962,7 +963,7 @@ static int __devinit snd_amd7930_create(struct snd_card *card, | |||
962 | 963 | ||
963 | if (request_irq(irq, snd_amd7930_interrupt, | 964 | if (request_irq(irq, snd_amd7930_interrupt, |
964 | IRQF_DISABLED | IRQF_SHARED, "amd7930", amd)) { | 965 | IRQF_DISABLED | IRQF_SHARED, "amd7930", amd)) { |
965 | snd_printk("amd7930-%d: Unable to grab IRQ %d\n", | 966 | snd_printk(KERN_ERR "amd7930-%d: Unable to grab IRQ %d\n", |
966 | dev, irq); | 967 | dev, irq); |
967 | snd_amd7930_free(amd); | 968 | snd_amd7930_free(amd); |
968 | return -EBUSY; | 969 | return -EBUSY; |