summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2006-09-17 22:00:51 +0200
committerJaroslav Kysela <perex@suse.cz>2006-09-23 10:47:15 +0200
commit783eaf4671a4f5a95102aedb5a45e1f8adab945c (patch)
tree678162376dee56761dfba7913d1c85aa62005bbe /sound
parent307192065c55dbc70159037c1e3006a9f761192b (diff)
downloadlinux-783eaf4671a4f5a95102aedb5a45e1f8adab945c.tar.gz
linux-783eaf4671a4f5a95102aedb5a45e1f8adab945c.tar.bz2
linux-783eaf4671a4f5a95102aedb5a45e1f8adab945c.zip
[ALSA] powermac - Fix Oops when conflicting with aoa driver
Fixed Oops when conflictin with aoa driver due to lack of i2c initialization. Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Diffstat (limited to 'sound')
-rw-r--r--sound/ppc/keywest.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/ppc/keywest.c b/sound/ppc/keywest.c
index 59482a4cd446..272ae38e9b18 100644
--- a/sound/ppc/keywest.c
+++ b/sound/ppc/keywest.c
@@ -117,6 +117,9 @@ int __init snd_pmac_tumbler_post_init(void)
{
int err;
+ if (!keywest_ctx || !keywest_ctx->client)
+ return -ENXIO;
+
if ((err = keywest_ctx->init_client(keywest_ctx)) < 0) {
snd_printk(KERN_ERR "tumbler: %i :cannot initialize the MCS\n", err);
return err;