diff options
| author | Takashi Iwai <tiwai@suse.de> | 2021-11-01 09:33:49 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2021-11-01 09:34:19 +0300 |
| commit | 8beea313507580ea2a18bf68f7589d40677c28ad (patch) | |
| tree | 0a1cd76a9b2a414f9dcb64db2432cbf964be3a44 /sound/firewire/motu/motu.c | |
| parent | 3ab7992018455ac63c33e9b3eaa7264e293e40f4 (diff) | |
| parent | 2672e1970ab051f0333fdbc61a55b7616f4f5778 (diff) | |
| download | linux-8beea313507580ea2a18bf68f7589d40677c28ad.tar.xz | |
Merge branch 'for-next' into for-linus
Merge 5.16-devel branch for upstreaming
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/firewire/motu/motu.c')
| -rw-r--r-- | sound/firewire/motu/motu.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/sound/firewire/motu/motu.c b/sound/firewire/motu/motu.c index f65426238d4c..5fc7ae475537 100644 --- a/sound/firewire/motu/motu.c +++ b/sound/firewire/motu/motu.c @@ -112,6 +112,16 @@ static int motu_probe(struct fw_unit *unit, const struct ieee1394_device_id *ent if (err < 0) goto error; + if (motu->spec->flags & SND_MOTU_SPEC_REGISTER_DSP) { + err = snd_motu_register_dsp_message_parser_new(motu); + if (err < 0) + goto error; + } else if (motu->spec->flags & SND_MOTU_SPEC_COMMAND_DSP) { + err = snd_motu_command_dsp_message_parser_new(motu); + if (err < 0) + goto error; + } + err = snd_card_register(card); if (err < 0) goto error; |