diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-05-04 10:00:16 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-05-04 10:00:16 -0400 |
commit | 3a20ac2c52b1317f5a5f0bd9cd3cbe8495ddd026 (patch) | |
tree | 9a912f2609cefb9698b5cce09cd240bd6dbd09fb /sound/sparc/amd7930.c | |
parent | 18cc8d8d9b74c446832336d8f6e1afb145f9431b (diff) | |
parent | 3e5b50165fd0be080044586f43fcdd460ed27610 (diff) |
Merge branch 'fix/pcm-jiffies-check' into fix/asoc
Diffstat (limited to 'sound/sparc/amd7930.c')
-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; |