Merge branch 'linux-2.6' into for-2.6.22

[pandora-kernel.git] / sound / ppc / keywest.c

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