Skip to content

Commit d650b3b

Browse files
committed
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
2 parents b8b68d2 + 4e7a8db commit d650b3b

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

drivers/pwm/pwm-bcm2835.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,8 @@ static int bcm2835_pwm_probe(struct platform_device *pdev)
155155
pc->chip.ops = &bcm2835_pwm_ops;
156156
pc->chip.npwm = 2;
157157

158+
platform_set_drvdata(pdev, pc);
159+
158160
ret = devm_pwmchip_add(&pdev->dev, &pc->chip);
159161
if (ret < 0)
160162
return dev_err_probe(&pdev->dev, ret,

0 commit comments

Comments
 (0)