From nobody Fri Apr 3 02:56:38 2026 Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 52ECC358363 for ; Tue, 24 Mar 2026 20:56:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774385785; cv=none; b=mLi6NQU/U3iRM4pzcHzGqqnIjfwAEtN4xXG4kkZkAklzXeMczv35WWs0HQ5g0VdwzeXVzhIRyrrlk0z3alhdyuRkJYxAhz9TuppZsREFSxNHagMUh7jvRLgAH1ZieTlL4AVaRD1aGSpUjb6Vd/LGBGq6c2+xF4Dep3JMjc3MvQ8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774385785; c=relaxed/simple; bh=XzjQ60/SSjQz1xsqxJT3tG/VXfobGKlnyRsg6JL3WmY=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:Content-Type; b=mLwC8g6g8G0bJkdRYw9FcIU7JabEUMQ+NwnQ5HDpbA5KvpFS2uOfPcoZ4j9rhe8pSgCkFi86J6R5h4c9YKDjjylf2CbbVX0yAUHVjcxVs688Sb5ofTO9VSPFuZJsBeKtOUqy4o/FoyC2P7UJ9Rgc/V6BcOmWXJQuoHkKs3kE5Cg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=ezCGOkpY; arc=none smtp.client-ip=209.85.128.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ezCGOkpY" Received: by mail-wm1-f44.google.com with SMTP id 5b1f17b1804b1-486fe2024a9so34013145e9.0 for ; Tue, 24 Mar 2026 13:56:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1774385783; x=1774990583; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=HYEM6pX7Y2U3EjDnmZx5hwFofI5ez2sNfPIMH8LA/QA=; b=ezCGOkpYPbSAZGCbyKw8ougX4UHWAQy32u/ucgUoIKOiKuMJmTUV6tjKOdXHUDvxRI sygNvbAYbkoAowbI3dKzcaERlSVGDPMjxsDDuM2/FVQ2FhnOtD4z3Tnzu00I2C/HzPfW 29ZAI1jTcMNFft5FuHAjv2tLgoofYTqed7XwjlAJ7QzF2Xp+T5jMWkvOrF/Iwc47m9XG LU8iViCWFJYRWfru8oeGwtVjDab7uA0tXYPm7K7ncn1rw4qYSlJDiUtZ7lggDHPZj6AF XmqFEr0GnHzUQwcnJDQ9uT7GZbIHxSfPaDYLyLkZcB0o7g+XS/+8o2GV6x/hHXAytQFL oi4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774385783; x=1774990583; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=HYEM6pX7Y2U3EjDnmZx5hwFofI5ez2sNfPIMH8LA/QA=; b=jsU/OX5BPWUATxnG+rZ8hl+z0paPEnkxP85zSZRu5NIso+zB0rWwgTVhhRCoDVMwjK J0oFRrEivuUu4G5YtgnDkh9XEnBUhWtySglGUZHPg9u4rIHlZonjuZ6Nbbj3nMEXGTYV odnb/0LWe+LHScvvTGv57e5YsqhXeFKiRXWo9GipwLzVPL9IVKPK9yvuPqcK4bvN7Tj4 ZpTA3NldOya+5Oj/JzMfnKXC0TSq8/2pRqmQpMAqYWgu4FtIJAFSzTa++XBI25tDRIU9 hFyINvq4D4gmF3lvfqn+vO2a8LL0JfPqIM0trBZyLchXjJBgnHn9zbSctgDsSZ1Toj1+ VRLw== X-Forwarded-Encrypted: i=1; AJvYcCWCVgU+hBF3qxeY+Xs+AgLRdduj1IlE9FXCePSRwiq9xVHNGDpLNE2ClwGM/tkCcbvGxzTR6BlBeU7m4w4=@vger.kernel.org X-Gm-Message-State: AOJu0YxJgEiZVuaYo4BlZmfgAPkqQIro9iOkZwE7X23yndZSuhsYOsoE fhBtZD6h0OrAuveQpshF6XkcWtmIHeO/hvWpQLev4ECEv87Puw6ofJE= X-Gm-Gg: ATEYQzywiJ8EMpS91tpnxey+IFo4RXFmNUNGz8ITP0qkvCHFlYXIepvVXyLjhuVy9IW Bl9K63Z2NMrHXNGBNehtfd00tTKpba7qoyOC4zflb2tuQ38LwPYXmjDpE7rjRmMzqTB+IPwZiEG 9EVjPSeIbrw4YdrvgrKFz4TPqWYrETsv5BBiW5luIjRa4S7JmLU8iBSxzcnuipjZqVU1LFpMk5L AtFeBgpJYFJBBgTvHJcbwhn8NXFJwSZr/NPP7oGyrvolPGTqQ9L/x7vJOgXei5do1pW4LbNIVRs OcwPhK1/IPvUfmxkA4qGoaYdBrH58x3ZjqKAphvsXEPIv54311kPLA9kBpzfSZr4wteVIDCCK5F Lmgsx776FTpau0rWchuUy3A+B3EdCjCVp5yJStVuUXPs433qBvseh52T5U47YPrOMERHQZI/eYM psS+IQy9c2l8Ko2Ez4Cra9/WeisLrBhy0y/UMVdVRA/w== X-Received: by 2002:a05:600c:3b16:b0:485:3f1c:d8a1 with SMTP id 5b1f17b1804b1-48715fcc0cemr18074605e9.9.1774385782469; Tue, 24 Mar 2026 13:56:22 -0700 (PDT) Received: from localhost.localdomain ([78.240.217.74]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48711709e95sm73907785e9.8.2026.03.24.13.56.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Mar 2026 13:56:21 -0700 (PDT) From: Jihed Chaibi To: linux-sound@vger.kernel.org Cc: lgirdwood@gmail.com, broonie@kernel.org, perex@perex.cz, tiwai@suse.com, linux-kernel@vger.kernel.org, jihed.chaibi.dev@gmail.com Subject: [PATCH] ASoC: kirkwood: Fix clock error handling in probe Date: Tue, 24 Mar 2026 21:55:51 +0100 Message-ID: <20260324205551.38786-1-jihed.chaibi.dev@gmail.com> X-Mailer: git-send-email 2.47.3 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Two problems in the same clock setup block: 1. clk_prepare_enable(priv->extclk) had its return value discarded, while the immediately following clk_prepare_enable(priv->clk) was correctly checked. A failure to enable the external clock was silently ignored. 2. If clk_prepare_enable(priv->clk) failed, priv->extclk was already enabled but never disabled =E2=80=94 the error path returned directly without cleanup. Fix both by checking extclk enable and restructuring the error labels to chain: err_component disables priv->clk then falls through to err_extclk which disables priv->extclk if present. Signed-off-by: Jihed Chaibi --- sound/soc/kirkwood/kirkwood-i2s.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sound/soc/kirkwood/kirkwood-i2s.c b/sound/soc/kirkwood/kirkwoo= d-i2s.c index 99bd066c7309..ea734bc33dc3 100644 --- a/sound/soc/kirkwood/kirkwood-i2s.c +++ b/sound/soc/kirkwood/kirkwood-i2s.c @@ -695,14 +695,16 @@ static int kirkwood_i2s_dev_probe(struct platform_dev= ice *pdev) priv->extclk =3D ERR_PTR(-EINVAL); } else { dev_info(&pdev->dev, "found external clock\n"); - clk_prepare_enable(priv->extclk); + err =3D clk_prepare_enable(priv->extclk); + if (err < 0) + return err; soc_dai =3D kirkwood_i2s_dai_extclk; } } =20 err =3D clk_prepare_enable(priv->clk); if (err < 0) - return err; + goto err_extclk; =20 /* Some sensible defaults - this reflects the powerup values */ priv->ctl_play =3D KIRKWOOD_PLAYCTL_SIZE_24; @@ -729,9 +731,10 @@ static int kirkwood_i2s_dev_probe(struct platform_devi= ce *pdev) return 0; =20 err_component: + clk_disable_unprepare(priv->clk); + err_extclk: if (!IS_ERR(priv->extclk)) clk_disable_unprepare(priv->extclk); - clk_disable_unprepare(priv->clk); =20 return err; } --=20 2.47.3