From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 EF1CD50C2B7; Wed, 30 Sep 2026 16:17:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790785063; cv=none; b=dBG4uYnlJwp5A02EcKWxsXfYlDWV+LjGjT0DTYfErh7U7eBOsXLs1YGXNjk6oq/suVGvX6i7BN8ILpvRnhKfFwfRVlEGIur83lMHxYlXm+sKdwXbkAy9iv0fdnPLLQmIS67WO5WBLc/Wbvcdzt8yE4Jqz2+M+qT0+qDHtVMoxCY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790785063; c=relaxed/simple; bh=iuW5YEJPxAb8O+QBF3FQ0/ANzu4N46yibP5WI2GOtFU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=umb8navYVaw8aqrWC+bzeuXmpHA7jcaT8Qk0xZ7/qaJqNjZqjsc6mvD+ZHuyNDtk80dAUK5A3pFW1UgWW3DeNiQG6QQjAmRzVBghHgN9VxIx9I0XUmlQ7Out4I6eQqG/n6VLuteQtbnS8Mj4Qk5HqKySUhbxhmhqYqLOSt8JN9M= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=KUFq+g4H; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="KUFq+g4H" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E1DEB1F000FF; Wed, 30 Sep 2026 16:17:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1790785056; bh=9th0ucaw1UgD8LOhuIyOza0euvtsZw5qUTxo+8mzcq0=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=KUFq+g4HgKz9ZIpVqSI8HMS+XzBMNlVIPIwKqKvQz5JG6sArhsdy12fqwf+BLc6j4 1dMmHiouG6SqN1SdJLotXaVtPiafPba98VmgmjvvyPxdK3h+iQHLQdMgvmEXPggu11 eGEB0H0yrcwj8yg8CeNYW69w3V/scV2SiFCxcw/0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Linus Walleij , Mark Brown , Sasha Levin Subject: [PATCH 6.1 374/982] ASoC: ux500: Propagate MSP setup errors Date: Wed, 30 Sep 2026 17:18:30 +0200 Message-ID: <20260930152424.846103065@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260930152416.775402466@linuxfoundation.org> References: <20260930152416.775402466@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Linus Walleij [ Upstream commit 3415421a2b0bc4e32bb5a9df24ed7863512d47a7 ] The prepare callback continues with a partly initialized configuration when format setup fails. Probe likewise tests the allocated pointer instead of the return value, so an MMIO resource or mapping failure can be ignored after allocation succeeds. Return configuration failures from prepare and test the MSP initialization result directly. Fixes: 3592b7f69a54 ("ASoC: Ux500: Add MSP I2S-driver") Assisted-by: LLM Signed-off-by: Linus Walleij Link: https://patch.msgid.link/20260902-ux500-msp-fixes-v2-2-4b60b002d55a@kernel.org Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/ux500/ux500_msp_dai.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sound/soc/ux500/ux500_msp_dai.c b/sound/soc/ux500/ux500_msp_dai.c index 39931ecb8ffbd..d24a3e9707c8d 100644 --- a/sound/soc/ux500/ux500_msp_dai.c +++ b/sound/soc/ux500/ux500_msp_dai.c @@ -468,7 +468,9 @@ static int ux500_msp_dai_prepare(struct snd_pcm_substream *substream, dev_dbg(dai->dev, "%s: MSP %d (%s): Enter (rate = %d).\n", __func__, dai->id, snd_pcm_stream_str(substream), runtime->rate); - setup_msp_config(substream, dai, &msp_config); + ret = setup_msp_config(substream, dai, &msp_config); + if (ret) + return ret; ret = ux500_msp_i2s_open(drvdata->msp, &msp_config); if (ret < 0) { @@ -764,7 +766,7 @@ static int ux500_msp_drv_probe(struct platform_device *pdev) } ret = ux500_msp_i2s_init_msp(pdev, &drvdata->msp); - if (!drvdata->msp) { + if (ret) { dev_err(&pdev->dev, "%s: ERROR: Failed to init MSP-struct (%d)!", __func__, ret); -- 2.53.0