[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 59482a4cd44641ecd8d9ab253c128c93ae1dd3a3..272ae38e9b1883154f7574000270a23b84d48b84 100644 (file)
--- 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;