hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ALSA: line6: Cleanup podhd initialization 

Only initialize PCM for POD HD devices that support it.
No POD HD seems to support MIDI, thus drop the initialization.

Signed-off-by: Andrej Krutak <dev@andree.sk>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Andrej Krutak 2016-09-18 20:59:31 +02:00 committed by Takashi Iwai
parent f6a0dd107a
commit cfa769695d
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sound/usb/line6/podhd.c
View File

@ -314,17 +314,14 @@ static int podhd_init(struct usb_line6 *line6,
return err; return err;
} }
/* initialize MIDI subsystem: */ if (pod->line6.properties->capabilities & LINE6_CAP_PCM) {
err = line6_init_midi(line6); /* initialize PCM subsystem: */
if (err < 0) err = line6_init_pcm(line6,
return err; (id->driver_info == LINE6_PODX3) ? &podx3_pcm_properties :
&podhd_pcm_properties);
/* initialize PCM subsystem: */ if (err < 0)
err = line6_init_pcm(line6, return err;
(id->driver_info == LINE6_PODX3) ? &podx3_pcm_properties : }
&podhd_pcm_properties);
if (err < 0)
return err;
if (!(pod->line6.properties->capabilities & LINE6_CAP_CONTROL)) { if (!(pod->line6.properties->capabilities & LINE6_CAP_CONTROL)) {
/* register USB audio system directly */ /* register USB audio system directly */