diff options
| author | Dylan Reid <dgreid@chromium.org> | 2013-03-14 17:27:46 -0700 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-03-15 07:41:12 +0100 |
| commit | b714a7106ba5423c418c25e6231116560f8a9ef8 (patch) | |
| tree | d28a9e7729cce0e8390bc8bc740bb9850ac143b0 /sound/pci | |
| parent | e8f1bd5d77484a1088797fd5689b1a37148a170e (diff) | |
| download | blackbird-op-linux-b714a7106ba5423c418c25e6231116560f8a9ef8.tar.gz blackbird-op-linux-b714a7106ba5423c418c25e6231116560f8a9ef8.zip | |
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) #ifndef CONFIG_SND_HDA_CODEC_CA0132_DSP return; /* NOP */ #endif - spec->dsp_state = DSP_DOWNLOAD_INIT; - if (spec->dsp_state == DSP_DOWNLOAD_INIT) { - chipio_enable_clocks(codec); - spec->dsp_state = DSP_DOWNLOADING; - if (!ca0132_download_dsp_images(codec)) - spec->dsp_state = DSP_DOWNLOAD_FAILED; - else - spec->dsp_state = DSP_DOWNLOADED; - } + chipio_enable_clocks(codec); + spec->dsp_state = DSP_DOWNLOADING; + if (!ca0132_download_dsp_images(codec)) + spec->dsp_state = DSP_DOWNLOAD_FAILED; + else + spec->dsp_state = DSP_DOWNLOADED; if (spec->dsp_state == DSP_DOWNLOADED) ca0132_set_dsp_msr(codec, true); |
