[5.4,22/57] ALSA: line6: Fix POD HD500 audio playback

Message ID	20200504165458.292374352@linuxfoundation.org
State	New
Headers	show Return-Path: <SRS0=p9ou=6S=vger.kernel.org=stable-owner@kernel.org> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Vasily Khoruzhick <anarsoul@gmail.com>, Takashi Iwai <tiwai@suse.de> Subject: [PATCH 5.4 22/57] ALSA: line6: Fix POD HD500 audio playback Date: Mon, 4 May 2020 19:57:26 +0200 Message-Id: <20200504165458.292374352@linuxfoundation.org> In-Reply-To: <20200504165456.783676004@linuxfoundation.org> References: <20200504165456.783676004@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk
Series	None \| expand [5.4,02/57] drm/edid: Fix off-by-one in DispID DTD pixel clock [5.4,03/57] drm/amd/display: Fix green screen issue after suspend [5.4,04/57] drm/qxl: qxl_release leak in qxl_draw_dirty_fb() [5.4,07/57] NFSv4.1: fix handling of backchannel binding in BIND_CONN_TO_SESSION [5.4,09/57] btrfs: fix block group leak when removing fails [5.4,10/57] btrfs: fix partial loss of prealloc extent past i_size after fsync [5.4,12/57] mmc: cqhci: Avoid false "cqhci: CQE stuck on" by not open-coding timeout loop [5.4,14/57] mmc: sdhci-pci: Fix eMMC driver strength for BYT-based controllers [5.4,16/57] mmc: meson-mx-sdio: Set MMC_CAP_WAIT_WHILE_BUSY [5.4,18/57] crypto: caam - fix the address of the last entry of S/G [5.4,22/57] ALSA: line6: Fix POD HD500 audio playback [5.4,23/57] ALSA: pcm: oss: Place the plugin buffer overflow checks correctly [5.4,29/57] PM: hibernate: Freeze kernel threads in software_resume() [5.4,30/57] dm verity fec: fix hash block number in verity_fec_decode [5.4,31/57] dm writecache: fix data corruption when reloading the target [5.4,34/57] scsi: qla2xxx: set UNLOADING before waiting for session deletion [5.4,35/57] scsi: qla2xxx: check UNLOADING before posting async work [5.4,37/57] RDMA/mlx4: Initialize ib_spec on the stack [5.4,38/57] RDMA/siw: Fix potential siw_mem refcnt leak in siw_fastreg_mr() [5.4,39/57] RDMA/core: Prevent mixed use of FDs between shared ufiles [5.4,44/57] vfio: avoid possible overflow in vfio_iommu_type1_pin_pages [5.4,45/57] vfio/type1: Fix VA->PA translation for PFNMAP VMAs in vaddr_get_pfn() [5.4,46/57] iommu/qcom: Fix local_base status check [5.4,49/57] i2c: aspeed: Avoid i2c interrupt status clear race condition. [5.4,52/57] nvme: prevent double free in nvme_alloc_ns() error handling [5.4,53/57] nfs: Fix potential posix_acl refcnt leak in nfs3_set_acl [5.4,54/57] dmaengine: dmatest: Fix iteration non-stop logic

Message ID

20200504165458.292374352@linuxfoundation.org

State

New

Headers

From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	stable@vger.kernel.org, Vasily Khoruzhick <anarsoul@gmail.com>,
	Takashi Iwai <tiwai@suse.de>
Subject: [PATCH 5.4 22/57] ALSA: line6: Fix POD HD500 audio playback
Date: Mon,  4 May 2020 19:57:26 +0200
Message-Id: <20200504165458.292374352@linuxfoundation.org>
In-Reply-To: <20200504165456.783676004@linuxfoundation.org>
References: <20200504165456.783676004@linuxfoundation.org>
User-Agent: quilt/0.66
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Sender: stable-owner@vger.kernel.org
Precedence: bulk

Series

None | expand

Commit Message

Greg Kroah-Hartman May 4, 2020, 5:57 p.m. UTC

From: Vasily Khoruzhick <anarsoul@gmail.com>

commit cc18b2f4f3f1d7ed3125ac1840794f9feab0325c upstream.

Apparently interface 1 is control interface akin to HD500X,
setting LINE6_CAP_CONTROL and choosing it as ctrl_if fixes
audio playback on POD HD500.

Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
Cc: <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/20200425201115.3430-1-anarsoul@gmail.com
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 sound/usb/line6/podhd.c |   22 +++++-----------------
 1 file changed, 5 insertions(+), 17 deletions(-)

--- a/sound/usb/line6/podhd.c
+++ b/sound/usb/line6/podhd.c
@@ -21,8 +21,7 @@ 
 enum {
 	LINE6_PODHD300,
 	LINE6_PODHD400,
-	LINE6_PODHD500_0,
-	LINE6_PODHD500_1,
+	LINE6_PODHD500,
 	LINE6_PODX3,
 	LINE6_PODX3LIVE,
 	LINE6_PODHD500X,
@@ -318,8 +317,7 @@  static const struct usb_device_id podhd_
 	/* TODO: no need to alloc data interfaces when only audio is used */
 	{ LINE6_DEVICE(0x5057),    .driver_info = LINE6_PODHD300 },
 	{ LINE6_DEVICE(0x5058),    .driver_info = LINE6_PODHD400 },
-	{ LINE6_IF_NUM(0x414D, 0), .driver_info = LINE6_PODHD500_0 },
-	{ LINE6_IF_NUM(0x414D, 1), .driver_info = LINE6_PODHD500_1 },
+	{ LINE6_IF_NUM(0x414D, 0), .driver_info = LINE6_PODHD500 },
 	{ LINE6_IF_NUM(0x414A, 0), .driver_info = LINE6_PODX3 },
 	{ LINE6_IF_NUM(0x414B, 0), .driver_info = LINE6_PODX3LIVE },
 	{ LINE6_IF_NUM(0x4159, 0), .driver_info = LINE6_PODHD500X },
@@ -352,23 +350,13 @@  static const struct line6_properties pod
 		.ep_audio_r = 0x82,
 		.ep_audio_w = 0x01,
 	},
-	[LINE6_PODHD500_0] = {
+	[LINE6_PODHD500] = {
 		.id = "PODHD500",
 		.name = "POD HD500",
-		.capabilities	= LINE6_CAP_PCM
+		.capabilities	= LINE6_CAP_PCM | LINE6_CAP_CONTROL
 				| LINE6_CAP_HWMON,
 		.altsetting = 1,
-		.ep_ctrl_r = 0x81,
-		.ep_ctrl_w = 0x01,
-		.ep_audio_r = 0x86,
-		.ep_audio_w = 0x02,
-	},
-	[LINE6_PODHD500_1] = {
-		.id = "PODHD500",
-		.name = "POD HD500",
-		.capabilities	= LINE6_CAP_PCM
-				| LINE6_CAP_HWMON,
-		.altsetting = 0,
+		.ctrl_if = 1,
 		.ep_ctrl_r = 0x81,
 		.ep_ctrl_w = 0x01,
 		.ep_audio_r = 0x86,

[5.4,22/57] ALSA: line6: Fix POD HD500 audio playback

Commit Message

Patch