瀏覽代碼

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>
Andrej Krutak 9 年之前
父節點
當前提交
cfa769695d
共有 1 個文件被更改,包括 8 次插入11 次删除
  1. 8 11
      sound/usb/line6/podhd.c

+ 8 - 11
sound/usb/line6/podhd.c

@@ -314,17 +314,14 @@ static int podhd_init(struct usb_line6 *line6,
 			return err;
 			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)) {
 	if (!(pod->line6.properties->capabilities & LINE6_CAP_CONTROL)) {
 		/* register USB audio system directly */
 		/* register USB audio system directly */