From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Purushothama Siddaiah <psiddaiah@mvista.com>,
Corey Minyard <cminyard@mvista.com>,
Mark Brown <broonie@kernel.org>, Sasha Levin <sashal@kernel.org>,
linux-spi@vger.kernel.org
Subject: [PATCH AUTOSEL 6.6 18/23] spi: omap2-mcspi: Fix the IS_ERR() bug for devm_clk_get_optional_enabled()
Date: Wed, 11 Dec 2024 13:51:55 -0500 [thread overview]
Message-ID: <20241211185214.3841978-18-sashal@kernel.org> (raw)
In-Reply-To: <20241211185214.3841978-1-sashal@kernel.org>
From: Purushothama Siddaiah <psiddaiah@mvista.com>
[ Upstream commit 4c6ac5446d060f0bf435ccc8bc3aa7b7b5f718ad ]
The devm_clk_get_optional_enabled() function returns error
pointers(PTR_ERR()). So use IS_ERR() to check it.
Verified on K3-J7200 EVM board, without clock node mentioned
in the device tree.
Signed-off-by: Purushothama Siddaiah <psiddaiah@mvista.com>
Reviewed-by: Corey Minyard <cminyard@mvista.com>
Link: https://patch.msgid.link/20241205070426.1861048-1-psiddaiah@mvista.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/spi/spi-omap2-mcspi.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/spi/spi-omap2-mcspi.c b/drivers/spi/spi-omap2-mcspi.c
index ddf1c684bcc7d..3cfd262c1abc2 100644
--- a/drivers/spi/spi-omap2-mcspi.c
+++ b/drivers/spi/spi-omap2-mcspi.c
@@ -1521,10 +1521,10 @@ static int omap2_mcspi_probe(struct platform_device *pdev)
}
mcspi->ref_clk = devm_clk_get_optional_enabled(&pdev->dev, NULL);
- if (mcspi->ref_clk)
- mcspi->ref_clk_hz = clk_get_rate(mcspi->ref_clk);
- else
+ if (IS_ERR(mcspi->ref_clk))
mcspi->ref_clk_hz = OMAP2_MCSPI_MAX_FREQ;
+ else
+ mcspi->ref_clk_hz = clk_get_rate(mcspi->ref_clk);
ctlr->max_speed_hz = mcspi->ref_clk_hz;
ctlr->min_speed_hz = mcspi->ref_clk_hz >> 15;
--
2.43.0
next prev parent reply other threads:[~2024-12-11 18:52 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-12-11 18:51 [PATCH AUTOSEL 6.6 01/23] watchdog: it87_wdt: add PWRGD enable quirk for Qotom QCML04 Sasha Levin
2024-12-11 18:51 ` [PATCH AUTOSEL 6.6 02/23] watchdog: mediatek: Add support for MT6735 TOPRGU/WDT Sasha Levin
2024-12-11 18:51 ` [PATCH AUTOSEL 6.6 03/23] scsi: qla1280: Fix hw revision numbering for ISP1020/1040 Sasha Levin
2024-12-11 18:51 ` [PATCH AUTOSEL 6.6 04/23] scsi: megaraid_sas: Fix for a potential deadlock Sasha Levin
2024-12-11 18:51 ` [PATCH AUTOSEL 6.6 05/23] udf: Skip parent dir link count update if corrupted Sasha Levin
2024-12-11 18:51 ` [PATCH AUTOSEL 6.6 06/23] ALSA: hda/conexant: fix Z60MR100 startup pop issue Sasha Levin
2024-12-11 18:51 ` [PATCH AUTOSEL 6.6 07/23] ALSA: sh: Use standard helper for buffer accesses Sasha Levin
2024-12-11 18:51 ` [PATCH AUTOSEL 6.6 08/23] smb: server: Fix building with GCC 15 Sasha Levin
2024-12-11 18:51 ` [PATCH AUTOSEL 6.6 09/23] regmap: Use correct format specifier for logging range errors Sasha Levin
2024-12-11 18:51 ` [PATCH AUTOSEL 6.6 10/23] LoongArch: Fix reserving screen info memory for above-4G firmware Sasha Levin
2024-12-11 18:51 ` [PATCH AUTOSEL 6.6 11/23] LoongArch/irq: Use seq_put_decimal_ull_width() for decimal values Sasha Levin
2024-12-11 18:51 ` [PATCH AUTOSEL 6.6 12/23] LoongArch: BPF: Adjust the parameter of emit_jirl() Sasha Levin
2024-12-11 18:51 ` [PATCH AUTOSEL 6.6 13/23] platform/x86: asus-nb-wmi: Ignore unknown event 0xCF Sasha Levin
2024-12-11 18:51 ` [PATCH AUTOSEL 6.6 14/23] net: sched: fix ordering of qlen adjustment Sasha Levin
2024-12-11 18:51 ` [PATCH AUTOSEL 6.6 15/23] spi: intel: Add Panther Lake SPI controller support Sasha Levin
2024-12-11 18:51 ` [PATCH AUTOSEL 6.6 16/23] scsi: mpt3sas: Diag-Reset when Doorbell-In-Use bit is set during driver load time Sasha Levin
2024-12-11 18:51 ` [PATCH AUTOSEL 6.6 17/23] scsi: storvsc: Do not flag MAINTENANCE_IN return of SRB_STATUS_DATA_OVERRUN as an error Sasha Levin
2024-12-11 18:51 ` Sasha Levin [this message]
2024-12-11 18:51 ` [PATCH AUTOSEL 6.6 19/23] drm/dp_mst: Ensure mst_primary pointer is valid in drm_dp_mst_handle_up_req() Sasha Levin
2024-12-11 18:51 ` [PATCH AUTOSEL 6.6 20/23] drm/dp_mst: Reset message rx state after OOM " Sasha Levin
2024-12-11 18:51 ` [PATCH AUTOSEL 6.6 21/23] virtio-blk: don't keep queue frozen during system suspend Sasha Levin
2024-12-11 18:51 ` [PATCH AUTOSEL 6.6 22/23] blk-mq: register cpuhp callback after hctx is added to xarray table Sasha Levin
2024-12-11 18:52 ` [PATCH AUTOSEL 6.6 23/23] blk-mq: move cpuhp callback registering out of q->sysfs_lock Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241211185214.3841978-18-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=broonie@kernel.org \
--cc=cminyard@mvista.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-spi@vger.kernel.org \
--cc=psiddaiah@mvista.com \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox