summaryrefslogtreecommitdiffstats
path: root/kernel/sound/sparc
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/sound/sparc')
-rw-r--r--kernel/sound/sparc/Kconfig1
-rw-r--r--kernel/sound/sparc/amd7930.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/kernel/sound/sparc/Kconfig b/kernel/sound/sparc/Kconfig
index d75deba56..dfcd38647 100644
--- a/kernel/sound/sparc/Kconfig
+++ b/kernel/sound/sparc/Kconfig
@@ -22,6 +22,7 @@ config SND_SUN_AMD7930
config SND_SUN_CS4231
tristate "Sun CS4231"
select SND_PCM
+ select SND_TIMER
help
Say Y here to include support for CS4231 sound device on Sun.
diff --git a/kernel/sound/sparc/amd7930.c b/kernel/sound/sparc/amd7930.c
index 1b1a89e80..35c1f6ae7 100644
--- a/kernel/sound/sparc/amd7930.c
+++ b/kernel/sound/sparc/amd7930.c
@@ -956,6 +956,7 @@ static int snd_amd7930_create(struct snd_card *card,
if (!amd->regs) {
snd_printk(KERN_ERR
"amd7930-%d: Unable to map chip registers.\n", dev);
+ kfree(amd);
return -EIO;
}
@@ -1063,6 +1064,7 @@ static const struct of_device_id amd7930_match[] = {
},
{},
};
+MODULE_DEVICE_TABLE(of, amd7930_match);
static struct platform_driver amd7930_sbus_driver = {
.driver = {