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
Unified · Split
| @@ -155,6 +155,8 @@ static int bcm2835_pwm_probe(struct platform_device *pdev) · 154 unmodified lines | |||
| 155 | pc->chip.ops = &bcm2835_pwm_ops; | 155 | pc->chip.ops = &bcm2835_pwm_ops; |
| 156 | pc->chip.npwm = 2; | 156 | pc->chip.npwm = 2; |
| 157 | 157 | ||
| 158 | platform_set_drvdata(pdev, pc); | ||
| 159 | |||
| 158 | ret = devm_pwmchip_add(&pdev->dev, &pc->chip); | 160 | ret = devm_pwmchip_add(&pdev->dev, &pc->chip); |
| 159 | if (ret < 0) | 161 | if (ret < 0) |
| 160 | return dev_err_probe(&pdev->dev, ret, | 162 | return dev_err_probe(&pdev->dev, ret, |