From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AA2433E5EC1 for ; Fri, 1 May 2026 17:27:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777656471; cv=none; b=arkZlN3Ik6+SDB/wtsctsW75jO4G0aQ2M2zjKmMX8BfnsIRWe/rxG/LqSSWhE+vJ1Y91kGGbR11NaMzrFdxp0Dg0f8Y2yYm1Yb49fPISRwLIrJ/M55ryX7d6diD+jZNZMw8A4Tavol3DZJ5ChwQXQTg9UXq/bbcY/iqXFmhDKO0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777656471; c=relaxed/simple; bh=WcjtvMtgT3IDnybTwBUqM2IBvaL+aIBC4g/0Cyf/Zu8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=AsPBnoJ/quIAu5cX8YiFYxqPnL7qeD1ifO0RAHcNcdN73R2gvpJz2B9K55AQzKU44gcPvoch2BmCozsUcliwMqcc/Yi61GfV101q7ZMSVCk1ClRfa8uPRcq1DxlTYBpC1aaqXrJoBzDzqoct9AdkhdePxIpZgcKWV2m7zRpiBAo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=UnnDxyAd; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="UnnDxyAd" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2A4ACC2BCC6; Fri, 1 May 2026 17:27:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1777656471; bh=WcjtvMtgT3IDnybTwBUqM2IBvaL+aIBC4g/0Cyf/Zu8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UnnDxyAdkutO1LNki0Wtxp4E5psuJWN4CQpxEeuzTm2JuGHvxsykpEVCWQEYHQ283 EEcY1zop1UgXJTX+DLECExyMoUMpzZEsHzarvxG/ntOSGziQuLCabv1rhirz1RcU4Y 6uaLV59Oo/V3mXjlAIMGLi7oojnpj16NrF3F5GHKjtkyPUVgb6KrImdL1p/xum1TR5 tMAzsxY3+spCdq41PyJli2YOI4aq9M10QW1cNXSmIwx7xepomVDAByyT/5xoRmSa4s VFMYibtbIeQdQbDz9A+kj0tWUntilrJQB6xv0cUgyPuwgZmX+KJ5H/bPpd1ZCdrHjw oqVQAM+ujJuAA== From: Sasha Levin To: stable@vger.kernel.org Cc: Thorsten Blum , Takashi Iwai , Sasha Levin Subject: [PATCH 6.6.y 2/2] ALSA: aoa: Skip devices with no codecs in i2sbus_resume() Date: Fri, 1 May 2026 13:27:47 -0400 Message-ID: <20260501172747.3765281-2-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260501172747.3765281-1-sashal@kernel.org> References: <2026050120-repurpose-unused-d87c@gregkh> <20260501172747.3765281-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Thorsten Blum [ Upstream commit fd7df93013c5118812e63a52635dc6c3a805a1de ] In i2sbus_resume(), skip devices with an empty codec list, which avoids using an uninitialized 'sysclock_factor' in the 32-bit format path in i2sbus_pcm_prepare(). In i2sbus_pcm_prepare(), replace two list_for_each_entry() loops with a single list_first_entry() now that the codec list is guaranteed to be non-empty by all callers. Fixes: f3d9478b2ce4 ("[ALSA] snd-aoa: add snd-aoa") Cc: stable@vger.kernel.org Signed-off-by: Thorsten Blum Link: https://patch.msgid.link/20260310102921.210109-3-thorsten.blum@linux.dev Signed-off-by: Takashi Iwai Signed-off-by: Sasha Levin --- sound/aoa/soundbus/i2sbus/core.c | 3 +++ sound/aoa/soundbus/i2sbus/pcm.c | 16 +++++----------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/sound/aoa/soundbus/i2sbus/core.c b/sound/aoa/soundbus/i2sbus/core.c index 51ed2f34b276d..d877718dda947 100644 --- a/sound/aoa/soundbus/i2sbus/core.c +++ b/sound/aoa/soundbus/i2sbus/core.c @@ -408,6 +408,9 @@ static int i2sbus_resume(struct macio_dev* dev) int err, ret = 0; list_for_each_entry(i2sdev, &control->list, item) { + if (list_empty(&i2sdev->sound.codec_list)) + continue; + /* reset i2s bus format etc. */ i2sbus_pcm_prepare_both(i2sdev); diff --git a/sound/aoa/soundbus/i2sbus/pcm.c b/sound/aoa/soundbus/i2sbus/pcm.c index dab5d92c87696..6b3857523458b 100644 --- a/sound/aoa/soundbus/i2sbus/pcm.c +++ b/sound/aoa/soundbus/i2sbus/pcm.c @@ -383,6 +383,9 @@ static int i2sbus_pcm_prepare(struct i2sbus_dev *i2sdev, int in) /* set stop command */ command->command = cpu_to_le16(DBDMA_STOP); + cii = list_first_entry(&i2sdev->sound.codec_list, + struct codec_info_item, list); + /* ok, let's set the serial format and stuff */ switch (runtime->format) { /* 16 bit formats */ @@ -390,13 +393,7 @@ static int i2sbus_pcm_prepare(struct i2sbus_dev *i2sdev, int in) case SNDRV_PCM_FORMAT_U16_BE: /* FIXME: if we add different bus factors we need to * do more here!! */ - bi.bus_factor = 0; - list_for_each_entry(cii, &i2sdev->sound.codec_list, list) { - bi.bus_factor = cii->codec->bus_factor; - break; - } - if (!bi.bus_factor) - return -ENODEV; + bi.bus_factor = cii->codec->bus_factor; input_16bit = 1; break; case SNDRV_PCM_FORMAT_S32_BE: @@ -410,10 +407,7 @@ static int i2sbus_pcm_prepare(struct i2sbus_dev *i2sdev, int in) return -EINVAL; } /* we assume all sysclocks are the same! */ - list_for_each_entry(cii, &i2sdev->sound.codec_list, list) { - bi.sysclock_factor = cii->codec->sysclock_factor; - break; - } + bi.sysclock_factor = cii->codec->sysclock_factor; if (clock_and_divisors(bi.sysclock_factor, bi.bus_factor, -- 2.53.0