Commit d650b3be authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pwm/for-6.7-rc5-fixes' of https://git.pengutronix.de/git/ukl/linux 

Pull pwm fix from Uwe Kleine-König:
 "This fixes a null pointer exception in the bcm2835 pwm driver.

  The problem was introduced by a combination of two commits merged for
  v6.7-rc1 where each change alone would have been fine.

  Thanks to Florian Fainelli for noticing and fixing the issue"

* tag 'pwm/for-6.7-rc5-fixes' of https://git.pengutronix.de/git/ukl/linux:
  pwm: bcm2835: Fix NPD in suspend/resume
parents b8b68d2f 4e7a8dbd

drivers/pwm/pwm-bcm2835.c

+2 −0
Original line number Diff line number Diff line
@@ -155,6 +155,8 @@ static int bcm2835_pwm_probe(struct platform_device *pdev) 
	pc->chip.ops = &bcm2835_pwm_ops;

	pc->chip.npwm = 2;



	platform_set_drvdata(pdev, pc);



	ret = devm_pwmchip_add(&pdev->dev, &pc->chip);

	if (ret < 0)

		return dev_err_probe(&pdev->dev, ret,