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 280892581; Tue, 23 Jan 2024 00:26:54 +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=1705969615; cv=none; b=WbQP/4J7XBL1v9pRiPgab58v/+oRgLqZdroSbvC6no4WxPy8+jDaMZxK8cCilvh2xJtG6Emlt+GIHd4uhL4WmSQ+eoe3BTcHm5bUH+VQSXEpVMRjDtGIjIPhf62dC59YUgYRYXygBe5XSlu+BlqJxFBzyD6eTATpipfEg9pvc2M= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705969615; c=relaxed/simple; bh=i417x3Ry8wDLvOhRDm/0GjUdHlkmr0M5wHRLy4O7mN0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tTjiuV74OrWzlb1gHL7pgrQJx7Pghbn46X97VqzVdT+vGpsvujl6HKlzWaEXZoHhxlUkv/G798w5PUMk1ppNm4BxkaZp4YyQXbM1cWUiWXu2OMSu/JiHxMyuFOAMoTaqdImm3o2IoYjfwGXoTPQUeLRf0C6olZFpUbqFcdRMtF8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=DWU8BL6P; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="DWU8BL6P" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9E49EC433F1; Tue, 23 Jan 2024 00:26:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1705969614; bh=i417x3Ry8wDLvOhRDm/0GjUdHlkmr0M5wHRLy4O7mN0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DWU8BL6POudosQ8fXZgo7wDalaOVEeGpJpVZvM3YJ8QVWnbstfk9lJmfOQ4eOiuOZ qjONItavSJ1/HNT+i12U2Q63l7vDIjV6M5eh2Bv1J1lHV6ZJCFwg29SvPOjMQcrkHB 66a/JkUppOzOAtrLJpoJJO3jUhpdQjWtMD+9rZic= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Mike Looijmans , Su Hui , Stephen Boyd , Sasha Levin Subject: [PATCH 6.7 342/641] clk: si5341: fix an error code problem in si5341_output_clk_set_rate Date: Mon, 22 Jan 2024 15:54:06 -0800 Message-ID: <20240122235828.619944997@linuxfoundation.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240122235818.091081209@linuxfoundation.org> References: <20240122235818.091081209@linuxfoundation.org> User-Agent: quilt/0.67 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.7-stable review patch. If anyone has any objections, please let me know. ------------------ From: Su Hui [ Upstream commit 5607068ae5ab02c3ac9cabc6859d36e98004c341 ] regmap_bulk_write() return zero or negative error code, return the value of regmap_bulk_write() rather than '0'. Fixes: 3044a860fd09 ("clk: Add Si5341/Si5340 driver") Acked-by: Mike Looijmans Signed-off-by: Su Hui Link: https://lore.kernel.org/r/20231101031633.996124-1-suhui@nfschina.com Signed-off-by: Stephen Boyd Signed-off-by: Sasha Levin --- drivers/clk/clk-si5341.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/clk/clk-si5341.c b/drivers/clk/clk-si5341.c index 845b451511d2..6e8dd7387cfd 100644 --- a/drivers/clk/clk-si5341.c +++ b/drivers/clk/clk-si5341.c @@ -895,10 +895,8 @@ static int si5341_output_clk_set_rate(struct clk_hw *hw, unsigned long rate, r[0] = r_div ? (r_div & 0xff) : 1; r[1] = (r_div >> 8) & 0xff; r[2] = (r_div >> 16) & 0xff; - err = regmap_bulk_write(output->data->regmap, + return regmap_bulk_write(output->data->regmap, SI5341_OUT_R_REG(output), r, 3); - - return 0; } static int si5341_output_reparent(struct clk_si5341_output *output, u8 index) -- 2.43.0