diff options
| author | Takashi Iwai <tiwai@suse.de> | 2006-10-16 14:37:31 +0200 |
|---|---|---|
| committer | Chris Wright <chrisw@sous-sol.org> | 2006-11-03 17:33:44 -0800 |
| commit | 0189ff18b9354352be1bdc9f1741ead538196adf (patch) | |
| tree | f982d9a90eee73f9faa8fad2b7269632e6dd581b /sound | |
| parent | 9e3fb449a46c40b3815d53d5c749066bd436a9b1 (diff) | |
[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>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/ppc/keywest.c | 3 |
1 files changed, 3 insertions, 0 deletions
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; |