From f705246a4c731d128136fce5b7755d59123957a4 Mon Sep 17 00:00:00 2001 From: Dylan Reid Date: Thu, 14 Mar 2013 17:27:45 -0700 Subject: [PATCH] --- yaml --- r: 361335 b: refs/heads/master c: e8f1bd5d77484a1088797fd5689b1a37148a170e h: refs/heads/master i: 361333: 55a0613f6f9ef06ac0ae99aadbdd888a7b65f57d 361331: fb272e96236b10fdc12edeca07f08aca085cd28a 361327: f1675fb2b3bff17d62c81fd46dc32e7c91dee1d3 v: v3 --- [refs] | 2 +- trunk/sound/pci/hda/patch_ca0132.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 6e0e220d629d..2d24bbed12cd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d1d28500cccc269fdbf81ba33d7328d1d2c04b2f +refs/heads/master: e8f1bd5d77484a1088797fd5689b1a37148a170e diff --git a/trunk/sound/pci/hda/patch_ca0132.c b/trunk/sound/pci/hda/patch_ca0132.c index cf24b75108d9..225d1d52abad 100644 --- a/trunk/sound/pci/hda/patch_ca0132.c +++ b/trunk/sound/pci/hda/patch_ca0132.c @@ -3239,7 +3239,7 @@ static int ca0132_set_vipsource(struct hda_codec *codec, int val) struct ca0132_spec *spec = codec->spec; unsigned int tmp; - if (!dspload_is_loaded(codec)) + if (spec->dsp_state != DSP_DOWNLOADED) return 0; /* if CrystalVoice if off, vipsource should be 0 */ @@ -4267,11 +4267,12 @@ static void ca0132_refresh_widget_caps(struct hda_codec *codec) */ static void ca0132_setup_defaults(struct hda_codec *codec) { + struct ca0132_spec *spec = codec->spec; unsigned int tmp; int num_fx; int idx, i; - if (!dspload_is_loaded(codec)) + if (spec->dsp_state != DSP_DOWNLOADED) return; /* out, in effects + voicefx */