Commit 576bb2d8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pwm/for-6.9-rc2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux 

Pull pwm fix from Uwe Kleine-König:
 "This contains a single fix for a regression introduced in v5.18-rc1
  which made the img pwm driver fail to bind"

* tag 'pwm/for-6.9-rc2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux:
  pwm: img: fix pwm clock lookup
parents 928a87ef 9eb05877

drivers/pwm/pwm-img.c

+2 −2
Original line number Diff line number Diff line
@@ -284,9 +284,9 @@ static int img_pwm_probe(struct platform_device *pdev) 
		return PTR_ERR(imgchip->sys_clk);

	}



	imgchip->pwm_clk = devm_clk_get(&pdev->dev, "imgchip");

	imgchip->pwm_clk = devm_clk_get(&pdev->dev, "pwm");

	if (IS_ERR(imgchip->pwm_clk)) {

		dev_err(&pdev->dev, "failed to get imgchip clock\n");

		dev_err(&pdev->dev, "failed to get pwm clock\n");

		return PTR_ERR(imgchip->pwm_clk);

	}