Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 361335
b: refs/heads/master
c: e8f1bd5
h: refs/heads/master
i:
  361333: 55a0613
  361331: fb272e9
  361327: f1675fb
v: v3
  • Loading branch information
Dylan Reid authored and Takashi Iwai committed Mar 15, 2013
1 parent 536e207 commit f705246
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d1d28500cccc269fdbf81ba33d7328d1d2c04b2f
refs/heads/master: e8f1bd5d77484a1088797fd5689b1a37148a170e
5 changes: 3 additions & 2 deletions trunk/sound/pci/hda/patch_ca0132.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down Expand Up @@ -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 */
Expand Down

0 comments on commit f705246

Please sign in to comment.