diff options
| author | Takashi Iwai <tiwai@suse.de> | 2021-07-01 09:34:15 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2021-07-01 09:34:15 +0300 |
| commit | 498386d1c4d98a72db7a2f51473593ad563b45ae (patch) | |
| tree | f94e6b211b9a50106e6e047cd992ae3e209ef007 /sound/pci/echoaudio/layla20_dsp.c | |
| parent | 5c6d4f97267f02f47acea8a652265348ec12de51 (diff) | |
| parent | dfc2e8ae4066a95c7f9c2bb2dfa26651feaa6b83 (diff) | |
| download | linux-498386d1c4d98a72db7a2f51473593ad563b45ae.tar.xz | |
Merge branch 'for-next' into for-linus
Diffstat (limited to 'sound/pci/echoaudio/layla20_dsp.c')
| -rw-r--r-- | sound/pci/echoaudio/layla20_dsp.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sound/pci/echoaudio/layla20_dsp.c b/sound/pci/echoaudio/layla20_dsp.c index 5e5b6e288a2d..5fb5c4a4598b 100644 --- a/sound/pci/echoaudio/layla20_dsp.c +++ b/sound/pci/echoaudio/layla20_dsp.c @@ -43,7 +43,8 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id) if (snd_BUG_ON((subdevice_id & 0xfff0) != LAYLA20)) return -ENODEV; - if ((err = init_dsp_comm_page(chip))) { + err = init_dsp_comm_page(chip); + if (err) { dev_err(chip->card->dev, "init_hw - could not initialize DSP comm page\n"); return err; @@ -60,7 +61,8 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id) chip->output_clock_types = ECHO_CLOCK_BIT_WORD | ECHO_CLOCK_BIT_SUPER; - if ((err = load_firmware(chip)) < 0) + err = load_firmware(chip); + if (err < 0) return err; chip->bad_board = false; |