From: Andy Shevchenko <andy.shevchenko@gmail.com>
To: Ard Biesheuvel <ardb@kernel.org>,
Andi Shyti <andi.shyti@kernel.org>,
Christophe JAILLET <christophe.jaillet@wanadoo.fr>,
linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Andy Shevchenko <andy.shevchenko@gmail.com>
Subject: [PATCH v1 1/1] i2c: synquacer: Fix clock rate retrieval code
Date: Thu, 12 Sep 2024 17:41:05 +0300 [thread overview]
Message-ID: <20240912144105.1555624-1-andy.shevchenko@gmail.com> (raw)
With the devm_clk_get_enabled() the probe will fail on the systems
that have no clock provided, such as ACPI-based ones.
synquacer_i2c SCX0003:00: error -ENOENT: failed to get and enable clock
synquacer_i2c SCX0003:00: probe with driver synquacer_i2c failed with error -2
Fix this by switching to devm_clk_get_optional_enabled() in conjunction with NULL
check, so we won't overwrite the clock rate from the property.
Fixes: 55750148e559 ("i2c: synquacer: Fix an error handling path in synquacer_i2c_probe()")
Reported-by: Ard Biesheuvel <ardb@kernel.org>
Closes: https://lore.kernel.org/r/CAMj1kXFH+zB_YuUS+vaEpguhuVGLYbQw55VNDCxnBfSPe6b-nw@mail.gmail.com
Signed-off-by: Andy Shevchenko <andy.shevchenko@gmail.com>
---
drivers/i2c/busses/i2c-synquacer.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/i2c/busses/i2c-synquacer.c b/drivers/i2c/busses/i2c-synquacer.c
index 4eccbcd0fbfc..49d01fa8fb4e 100644
--- a/drivers/i2c/busses/i2c-synquacer.c
+++ b/drivers/i2c/busses/i2c-synquacer.c
@@ -550,12 +550,12 @@ static int synquacer_i2c_probe(struct platform_device *pdev)
device_property_read_u32(&pdev->dev, "socionext,pclk-rate",
&i2c->pclkrate);
- pclk = devm_clk_get_enabled(&pdev->dev, "pclk");
+ pclk = devm_clk_get_optional_enabled(&pdev->dev, "pclk");
if (IS_ERR(pclk))
return dev_err_probe(&pdev->dev, PTR_ERR(pclk),
"failed to get and enable clock\n");
-
- i2c->pclkrate = clk_get_rate(pclk);
+ if (pclk)
+ i2c->pclkrate = clk_get_rate(pclk);
if (i2c->pclkrate < SYNQUACER_I2C_MIN_CLK_RATE ||
i2c->pclkrate > SYNQUACER_I2C_MAX_CLK_RATE)
--
2.46.0
next reply other threads:[~2024-09-12 14:42 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-12 14:41 Andy Shevchenko [this message]
2024-09-12 14:49 ` [PATCH v1 1/1] i2c: synquacer: Fix clock rate retrieval code Andi Shyti
2024-09-12 15:38 ` Andy Shevchenko
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=20240912144105.1555624-1-andy.shevchenko@gmail.com \
--to=andy.shevchenko@gmail.com \
--cc=andi.shyti@kernel.org \
--cc=ardb@kernel.org \
--cc=christophe.jaillet@wanadoo.fr \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@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