diff options
| author | Andrej Krutak <dev@andree.sk> | 2016-09-18 20:59:31 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2016-09-19 23:02:36 +0200 |
| commit | cfa769695d2bc50b729db6a5973398b24d126c79 (patch) | |
| tree | 9f0830d2fac6a4de8a5606e4e9a3188538b81454 /sound/usb | |
| parent | f6a0dd107ad0c8b59d1c9735eea4b8cb9f460949 (diff) | |
| download | talos-obmc-linux-cfa769695d2bc50b729db6a5973398b24d126c79.tar.gz talos-obmc-linux-cfa769695d2bc50b729db6a5973398b24d126c79.zip | |
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>
Diffstat (limited to 'sound/usb')
| -rw-r--r-- | sound/usb/line6/podhd.c | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/sound/usb/line6/podhd.c b/sound/usb/line6/podhd.c index 4bacbf7f963d..9352a44ae6e4 100644 --- a/sound/usb/line6/podhd.c +++ b/sound/usb/line6/podhd.c @@ -314,17 +314,14 @@ static int podhd_init(struct usb_line6 *line6, return err; } - /* initialize MIDI subsystem: */ - err = line6_init_midi(line6); - if (err < 0) - return err; - - /* initialize PCM subsystem: */ - err = line6_init_pcm(line6, - (id->driver_info == LINE6_PODX3) ? &podx3_pcm_properties : - &podhd_pcm_properties); - if (err < 0) - return err; + if (pod->line6.properties->capabilities & LINE6_CAP_PCM) { + /* initialize PCM subsystem: */ + err = line6_init_pcm(line6, + (id->driver_info == LINE6_PODX3) ? &podx3_pcm_properties : + &podhd_pcm_properties); + if (err < 0) + return err; + } if (!(pod->line6.properties->capabilities & LINE6_CAP_CONTROL)) { /* register USB audio system directly */ |
