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 3BD4E223702; Mon, 10 Mar 2025 17:44:34 +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=1741628674; cv=none; b=edSsBrkmZGQjqaDrJvEJ5pe9f55nbfdGXWNTqFZEcem0LMez1SC3m+IQO6vSB79wJKBznJ7aLIo9PSLufztr6e2o3jPY4kfTWvbPeZKbVdMnnDIe1bgZZO0ZWslOF1d77tNJe95f9uaJeRNloRONSC6J2nZJ7s6vxJmQONcbwwE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741628674; c=relaxed/simple; bh=uKchUW3+6Am8IHONyAxPpUWamcA6dL2dlcEzRJ6KE8U=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bn9S4uEzUEWNoKiQhlChcoBE7iopShyFJvVUro+WCD7Jf8uR3PQe+/38wNt50hS201JIqaTPYSNLqqbGpoSzhHF7NBYH7o0bZuHREcLUNSUripQRG4BqON5v+ga5awc1hJrxAw+kfbGqteUT5QDJQSDjj6fTsoBzRBOGVikLwAE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=B510xwXA; 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="B510xwXA" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B72A9C4CEE5; Mon, 10 Mar 2025 17:44:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1741628674; bh=uKchUW3+6Am8IHONyAxPpUWamcA6dL2dlcEzRJ6KE8U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=B510xwXANO4jUvP1vsPe1/6Y5EiNcj9szrfel6TAov0oE7CB1aNLwrQsXT6izOSBR qOItqjdDhA3Gdu9Zfmf5bf5C0mu95O7WX5yn+hZjtS2JzZg/3KTKZCDp7rmJibsRRU 3uLSanYoLGLuadwhTyXvpTdBLituNhtM0hIC9HhE= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Mingwei Zheng , Jiasheng Jiang , Mark Brown , Sasha Levin Subject: [PATCH 5.15 029/620] spi: zynq-qspi: Add check for clk_enable() Date: Mon, 10 Mar 2025 17:57:55 +0100 Message-ID: <20250310170546.729849788@linuxfoundation.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250310170545.553361750@linuxfoundation.org> References: <20250310170545.553361750@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Mingwei Zheng [ Upstream commit 8332e667099712e05ec87ba2058af394b51ebdc9 ] Add check for the return value of clk_enable() to catch the potential error. Fixes: c618a90dcaf3 ("spi: zynq-qspi: Drop GPIO header") Signed-off-by: Mingwei Zheng Signed-off-by: Jiasheng Jiang Link: https://patch.msgid.link/20241207015206.3689364-1-zmw12306@gmail.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- drivers/spi/spi-zynq-qspi.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/drivers/spi/spi-zynq-qspi.c b/drivers/spi/spi-zynq-qspi.c index 78f31b61a2aac..77ea6b5223483 100644 --- a/drivers/spi/spi-zynq-qspi.c +++ b/drivers/spi/spi-zynq-qspi.c @@ -379,12 +379,21 @@ static int zynq_qspi_setup_op(struct spi_device *spi) { struct spi_controller *ctlr = spi->master; struct zynq_qspi *qspi = spi_controller_get_devdata(ctlr); + int ret; if (ctlr->busy) return -EBUSY; - clk_enable(qspi->refclk); - clk_enable(qspi->pclk); + ret = clk_enable(qspi->refclk); + if (ret) + return ret; + + ret = clk_enable(qspi->pclk); + if (ret) { + clk_disable(qspi->refclk); + return ret; + } + zynq_qspi_write(qspi, ZYNQ_QSPI_ENABLE_OFFSET, ZYNQ_QSPI_ENABLE_ENABLE_MASK); -- 2.39.5