From: Takashi Iwai <tiwai@suse.de>
Date: Mon, 16 Oct 2006 12:37:31 +0000 (+0200)
Subject: [PATCH] ALSA: powermac - Fix Oops when conflicting with aoa driver
X-Git-Tag: v2.6.18.2~54
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0189ff18b9354352be1bdc9f1741ead538196adf;p=thirdparty%2Fkernel%2Fstable.git

[PATCH] 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: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
---

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