diff options
| author | Dylan Reid <dgreid@chromium.org> | 2013-03-14 20:27:46 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-03-15 02:41:12 -0400 |
| commit | b714a7106ba5423c418c25e6231116560f8a9ef8 (patch) | |
| tree | d28a9e7729cce0e8390bc8bc740bb9850ac143b0 /sound/pci | |
| parent | e8f1bd5d77484a1088797fd5689b1a37148a170e (diff) | |
ALSA: hda/ca0132 - Remove extra setting of dsp_state.
spec->dsp_state is initialized to DSP_DOWNLOAD_INIT, no need to reset
and check it in ca0132_download_dsp().
Signed-off-by: Dylan Reid <dgreid@chromium.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci')
| -rw-r--r-- | sound/pci/hda/patch_ca0132.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/sound/pci/hda/patch_ca0132.c b/sound/pci/hda/patch_ca0132.c index 225d1d52abad..0792b5725f9c 100644 --- a/sound/pci/hda/patch_ca0132.c +++ b/sound/pci/hda/patch_ca0132.c | |||
| @@ -4372,16 +4372,13 @@ static void ca0132_download_dsp(struct hda_codec *codec) | |||
| 4372 | #ifndef CONFIG_SND_HDA_CODEC_CA0132_DSP | 4372 | #ifndef CONFIG_SND_HDA_CODEC_CA0132_DSP |
| 4373 | return; /* NOP */ | 4373 | return; /* NOP */ |
| 4374 | #endif | 4374 | #endif |
| 4375 | spec->dsp_state = DSP_DOWNLOAD_INIT; | ||
| 4376 | 4375 | ||
| 4377 | if (spec->dsp_state == DSP_DOWNLOAD_INIT) { | 4376 | chipio_enable_clocks(codec); |
| 4378 | chipio_enable_clocks(codec); | 4377 | spec->dsp_state = DSP_DOWNLOADING; |
| 4379 | spec->dsp_state = DSP_DOWNLOADING; | 4378 | if (!ca0132_download_dsp_images(codec)) |
| 4380 | if (!ca0132_download_dsp_images(codec)) | 4379 | spec->dsp_state = DSP_DOWNLOAD_FAILED; |
| 4381 | spec->dsp_state = DSP_DOWNLOAD_FAILED; | 4380 | else |
| 4382 | else | 4381 | spec->dsp_state = DSP_DOWNLOADED; |
| 4383 | spec->dsp_state = DSP_DOWNLOADED; | ||
| 4384 | } | ||
| 4385 | 4382 | ||
| 4386 | if (spec->dsp_state == DSP_DOWNLOADED) | 4383 | if (spec->dsp_state == DSP_DOWNLOADED) |
| 4387 | ca0132_set_dsp_msr(codec, true); | 4384 | ca0132_set_dsp_msr(codec, true); |