]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
ALSA: line6: Cleanup podhd initialization
authorAndrej Krutak <dev@andree.sk>
Sun, 18 Sep 2016 18:59:31 +0000 (20:59 +0200)
committerTakashi Iwai <tiwai@suse.de>
Mon, 19 Sep 2016 21:02:36 +0000 (23:02 +0200)
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>
sound/usb/line6/podhd.c

index 4bacbf7f963dedff56865a0c37a27bbb6282ca02..9352a44ae6e4a5dcb4230c7192ec75f9a788e5d1 100644 (file)
@@ -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 */