aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrej Krutak <dev@andree.sk>2016-09-18 14:59:31 -0400
committerTakashi Iwai <tiwai@suse.de>2016-09-19 17:02:36 -0400
commitcfa769695d2bc50b729db6a5973398b24d126c79 (patch)
tree9f0830d2fac6a4de8a5606e4e9a3188538b81454
parentf6a0dd107ad0c8b59d1c9735eea4b8cb9f460949 (diff)
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>
-rw-r--r--sound/usb/line6/podhd.c19
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,
314 return err; 314 return err;
315 } 315 }
316 316
317 /* initialize MIDI subsystem: */ 317 if (pod->line6.properties->capabilities & LINE6_CAP_PCM) {
318 err = line6_init_midi(line6); 318 /* initialize PCM subsystem: */
319 if (err < 0) 319 err = line6_init_pcm(line6,
320 return err; 320 (id->driver_info == LINE6_PODX3) ? &podx3_pcm_properties :
321 321 &podhd_pcm_properties);
322 /* initialize PCM subsystem: */ 322 if (err < 0)
323 err = line6_init_pcm(line6, 323 return err;
324 (id->driver_info == LINE6_PODX3) ? &podx3_pcm_properties : 324 }
325 &podhd_pcm_properties);
326 if (err < 0)
327 return err;
328 325
329 if (!(pod->line6.properties->capabilities & LINE6_CAP_CONTROL)) { 326 if (!(pod->line6.properties->capabilities & LINE6_CAP_CONTROL)) {
330 /* register USB audio system directly */ 327 /* register USB audio system directly */