From: Takashi Iwai <tiwai@suse.de>
Date: Sun, 17 Sep 2006 20:00:51 +0000 (+0200)
Subject: [ALSA] powermac - Fix Oops when conflicting with aoa driver
X-Git-Tag: v2.6.19-rc1~1270^2~17
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=783eaf4671a4f5a95102aedb5a45e1f8adab945c;p=linux-2.6-omap-h63xx.git

[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>
---

diff --git a/sound/ppc/keywest.c b/sound/ppc/keywest.c
index 59482a4cd44..272ae38e9b1 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;