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 F4197304BA3 for ; Fri, 1 May 2026 17:13:37 +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=1777655618; cv=none; b=GZkrZHU6bHst8jRjt/nBUSiKUVVORvC/DkeOVGksnVnfD9VPc216s71LThmzfDPGgRy7+yH7ef4HE6+EQ0WbMSXkpkKaVmQhfM+xV0CDtptAa2GzYqlSzWsoYE2xMwhhVgRqtd2mS3UOK1jfLwwsYIkd8BHJItlC9bckOEgNJZ0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777655618; c=relaxed/simple; bh=U8pqE7dxvHCn7wBdGDUAemDbfO6vn7fm69GbgJvnEqM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=OZ71G08FmIksvgAna5fzjd8sH+jmL6lBDVkMjNBK0r9PZzaNaFdPveaAvWkqEIo0AV8A/eCZ576Q/jJHtWPwVTQAq498bxRdgB8SUVE2ui8+PwYSmc+LsFrq1bB2nW57vD+FEP9l4/DI2XHWf1Kc3PZRy1DbbiIVJDGHGtxE8Eg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=rT8dfqzZ; 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="rT8dfqzZ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6D353C2BCB9; Fri, 1 May 2026 17:13:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1777655617; bh=U8pqE7dxvHCn7wBdGDUAemDbfO6vn7fm69GbgJvnEqM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rT8dfqzZB3m1YGCkK35qhbSTv20G6XXfzlqDdKAg2HDEHx2w/qB9nNIJkzUMsSVql 9JWvKopTdoWhQicHEbJ2uH+ZxevcAUzIJ9s+Px8uH86kA0Ds1mBx9xzbtksFRPYiTT 6rDTgOl5bCGRABbHlhtNzyN/cjSFd+M3A86dMxYB0Z/LgaMcpT+fldc8deqP8tlRAv Z4sqdOSPivBduvUVqDckhBIXmiNbeGGbcp+yYoIAOjPiz9QRpoImfVRqxFPqY1hNM1 G73AzDPTILgMllP8KWBl9rftiOe6w/dJjpp6I75R199AfK2F6xyo3QO+HsQ+BMaSVa FKBawpMk/v1gA== From: Sasha Levin To: stable@vger.kernel.org Cc: Thorsten Blum , Takashi Iwai , Sasha Levin Subject: [PATCH 6.12.y 2/2] ALSA: aoa: Skip devices with no codecs in i2sbus_resume() Date: Fri, 1 May 2026 13:13:33 -0400 Message-ID: <20260501171333.3681629-2-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260501171333.3681629-1-sashal@kernel.org> References: <2026050120-trustless-overcome-452a@gregkh> <20260501171333.3681629-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 ce84288168e45..f7d5c50fdf966 100644 --- a/sound/aoa/soundbus/i2sbus/core.c +++ b/sound/aoa/soundbus/i2sbus/core.c @@ -407,6 +407,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 1edda4c9c6ab3..a161d5ba60014 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