2006-11-01 05:57:09

by Chris Wright

[permalink] [raw]
Subject: [PATCH 09/61] ALSA: powermac - Fix Oops when conflicting with aoa driver

-stable review patch. If anyone has any objections, please let us know.
------------------

From: Takashi Iwai <[email protected]>

[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 <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
Signed-off-by: Chris Wright <[email protected]>

---
sound/ppc/keywest.c | 3 +++
1 file changed, 3 insertions(+)

--- linux-2.6.18.1.orig/sound/ppc/keywest.c
+++ linux-2.6.18.1/sound/ppc/keywest.c
@@ -117,6 +117,9 @@ int __init snd_pmac_tumbler_post_init(vo
{
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;

--