diff options
author | Takashi Iwai <tiwai@suse.de> | 2006-09-17 16:00:51 -0400 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2006-09-23 04:47:15 -0400 |
commit | 783eaf4671a4f5a95102aedb5a45e1f8adab945c (patch) | |
tree | 678162376dee56761dfba7913d1c85aa62005bbe | |
parent | 307192065c55dbc70159037c1e3006a9f761192b (diff) |
[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>
-rw-r--r-- | sound/ppc/keywest.c | 3 |
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) | |||
117 | { | 117 | { |
118 | int err; | 118 | int err; |
119 | 119 | ||
120 | if (!keywest_ctx || !keywest_ctx->client) | ||
121 | return -ENXIO; | ||
122 | |||
120 | if ((err = keywest_ctx->init_client(keywest_ctx)) < 0) { | 123 | if ((err = keywest_ctx->init_client(keywest_ctx)) < 0) { |
121 | snd_printk(KERN_ERR "tumbler: %i :cannot initialize the MCS\n", err); | 124 | snd_printk(KERN_ERR "tumbler: %i :cannot initialize the MCS\n", err); |
122 | return err; | 125 | return err; |