diff options
| author | Takashi Iwai <tiwai@suse.de> | 2021-07-01 08:34:15 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2021-07-01 08:34:15 +0200 |
| commit | 498386d1c4d98a72db7a2f51473593ad563b45ae (patch) | |
| tree | f94e6b211b9a50106e6e047cd992ae3e209ef007 /sound/synth/emux/emux.c | |
| parent | 5c6d4f97267f02f47acea8a652265348ec12de51 (diff) | |
| parent | dfc2e8ae4066a95c7f9c2bb2dfa26651feaa6b83 (diff) | |
| download | lwn-498386d1c4d98a72db7a2f51473593ad563b45ae.tar.gz lwn-498386d1c4d98a72db7a2f51473593ad563b45ae.zip | |
Merge branch 'for-next' into for-linus
Diffstat (limited to 'sound/synth/emux/emux.c')
| -rw-r--r-- | sound/synth/emux/emux.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/synth/emux/emux.c b/sound/synth/emux/emux.c index f65e6c7b139f..49d1976a132c 100644 --- a/sound/synth/emux/emux.c +++ b/sound/synth/emux/emux.c @@ -104,7 +104,8 @@ int snd_emux_register(struct snd_emux *emu, struct snd_card *card, int index, ch if (emu->sflist == NULL) return -ENOMEM; - if ((err = snd_emux_init_hwdep(emu)) < 0) + err = snd_emux_init_hwdep(emu); + if (err < 0) return err; snd_emux_init_voices(emu); |