diff mbox series

ASoC: bcm2835: Silence clk_get() error on -EPROBE_DEFER

Message ID 1595564371-13692-1-git-send-email-sw0312.kim@samsung.com (mailing list archive)
State Accepted
Commit 92a007944e37a6de8820dca83e802f35c6faca3a
Headers show
Series ASoC: bcm2835: Silence clk_get() error on -EPROBE_DEFER | expand

Commit Message

Seung-Woo Kim July 24, 2020, 4:19 a.m. UTC
Silence clk_get() error with dev_dbg() on -EPROBE_DEFER.

Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>
---
 sound/soc/bcm/bcm2835-i2s.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

Comments

Mark Brown July 28, 2020, 4:30 p.m. UTC | #1
On Fri, 24 Jul 2020 13:19:31 +0900, Seung-Woo Kim wrote:
> Silence clk_get() error with dev_dbg() on -EPROBE_DEFER.

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Thanks!

[1/1] ASoC: bcm2835: Silence clk_get() error on -EPROBE_DEFER
      commit: 92a007944e37a6de8820dca83e802f35c6faca3a

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark
diff mbox series

Patch

diff --git a/sound/soc/bcm/bcm2835-i2s.c b/sound/soc/bcm/bcm2835-i2s.c
index d80b570..dc34fe1 100644
--- a/sound/soc/bcm/bcm2835-i2s.c
+++ b/sound/soc/bcm/bcm2835-i2s.c
@@ -841,9 +841,12 @@  static int bcm2835_i2s_probe(struct platform_device *pdev)
 	dev->clk_prepared = false;
 	dev->clk = devm_clk_get(&pdev->dev, NULL);
 	if (IS_ERR(dev->clk)) {
-		dev_err(&pdev->dev, "could not get clk: %ld\n",
-			PTR_ERR(dev->clk));
-		return PTR_ERR(dev->clk);
+		ret = PTR_ERR(dev->clk);
+		if (ret == -EPROBE_DEFER)
+			dev_dbg(&pdev->dev, "could not get clk: %d\n", ret);
+		else
+			dev_err(&pdev->dev, "could not get clk: %d\n", ret);
+		return ret;
 	}
 
 	/* Request ioarea */