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 9AD7A3DC69E; Sat, 28 Feb 2026 17:40:53 +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=1772300453; cv=none; b=mfJ/RecXRr4AAP7+UE6MfC4s8AmYaZ49MUwak8AONGSUkKYtJHid2/T80bW7fctLbOOI3MpzPf2JjzlX8kyw26ONhUw0NBNqWXIsyiyCBPbrVBOY6z9oJ7m3GcPWiWiPV18sL33fF8HRSQG2AwjfTICQA4OrNrmsi0sVZXdnxL8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772300453; c=relaxed/simple; bh=+M3Ojoc64XvgPwIK89boFs6nFnX5f6iJJtVGh9XQs3Q=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=eoT8Mab0yHpSgUy8K8rlhDkFEKOoMm2f2I+8cEo0wEX852hSECfQXTTEMO0XQrcg/4p3Z/90lEhOKY5pyVc8PCnJUgeZoal8wkVB51DIJuo0+PPOuoTGr7iVs60LjuRnwVnf+oYxGVJV6TMU5J4FlJWsK6Slu00okIw1Yuinh+4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=GYk/rh4h; 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="GYk/rh4h" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B839BC19425; Sat, 28 Feb 2026 17:40:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772300453; bh=+M3Ojoc64XvgPwIK89boFs6nFnX5f6iJJtVGh9XQs3Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GYk/rh4hn7tItJ17gvh4O3Rml2I9Hr7A2RhQiUFwlFPa90EHSx7cS/3adNynI4ZoY jwnsb547tu0PezLO0UPnn6DlBe4qgKd+I5Us28tZ23m6h9lvwh67J7/BDwQOFAdYfG AY70UJA3LPeFzc1+WgvL6q6ZEi4OlS3Fp9Zb6e4uAncU7TOthFAwUaiC42K0HLuTxu G4zRkbL8s89zQ3T9gzdqXi+ap0/1ScX2pKNStBKOq4mlPPSah59Ubcd+uzglhrmdSA cNza/n3vJnjXyzvlMDwENEK8Os50mguSpYN3+ahCPvsGZDKW4BJ3re5gWk6ipb88eI RXMLKmLuMQ+1A== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Felix Gu , Ivan Vecera , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.19 493/844] dpll: zl3073x: Remove redundant cleanup in devm_dpll_init() Date: Sat, 28 Feb 2026 12:26:46 -0500 Message-ID: <20260228173244.1509663-494-sashal@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260228173244.1509663-1-sashal@kernel.org> References: <20260228173244.1509663-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit From: Felix Gu [ Upstream commit 676c7af91fcd740d34e7cb788cbc58e3bcafde39 ] The devm_add_action_or_reset() function already executes the cleanup action on failure before returning an error, so the explicit goto error and subsequent zl3073x_dev_dpll_fini() call causes double cleanup. Fixes: ebb1031c5137 ("dpll: zl3073x: Refactor DPLL initialization") Reviewed-by: Ivan Vecera Signed-off-by: Felix Gu Link: https://patch.msgid.link/20260224-dpll-v2-1-d7786414a830@gmail.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/dpll/zl3073x/core.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/dpll/zl3073x/core.c b/drivers/dpll/zl3073x/core.c index b20d4f24c0e94..b9b7c751b7602 100644 --- a/drivers/dpll/zl3073x/core.c +++ b/drivers/dpll/zl3073x/core.c @@ -978,11 +978,7 @@ zl3073x_devm_dpll_init(struct zl3073x_dev *zldev, u8 num_dplls) } /* Add devres action to release DPLL related resources */ - rc = devm_add_action_or_reset(zldev->dev, zl3073x_dev_dpll_fini, zldev); - if (rc) - goto error; - - return 0; + return devm_add_action_or_reset(zldev->dev, zl3073x_dev_dpll_fini, zldev); error: zl3073x_dev_dpll_fini(zldev); -- 2.51.0