diff options
| author | Joel Stanley <joel@jms.id.au> | 2022-01-31 09:13:16 +0300 |
|---|---|---|
| committer | Joel Stanley <joel@jms.id.au> | 2022-01-31 09:13:20 +0300 |
| commit | abce5ba7169dbf9a66fe24acd93dd136da92fe00 (patch) | |
| tree | 8e126ded4d32aae8688c02e908b2f6d4c75de626 /drivers/pinctrl | |
| parent | 2383899f793d3c409c974dcb517579834c4a3674 (diff) | |
| parent | 9c43548a7fb8220b13b0ff980989b44f37d54138 (diff) | |
| download | linux-abce5ba7169dbf9a66fe24acd93dd136da92fe00.tar.xz | |
Merge tag 'v5.15.18' into dev-5.15
This is the 5.15.18 stable release
Signed-off-by: Joel Stanley <joel@jms.id.au>
Diffstat (limited to 'drivers/pinctrl')
| -rw-r--r-- | drivers/pinctrl/pinctrl-rockchip.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pinctrl/pinctrl-rockchip.c b/drivers/pinctrl/pinctrl-rockchip.c index 5ce260f152ce..dc52da94af0b 100644 --- a/drivers/pinctrl/pinctrl-rockchip.c +++ b/drivers/pinctrl/pinctrl-rockchip.c @@ -2748,7 +2748,7 @@ static int rockchip_pinctrl_probe(struct platform_device *pdev) platform_set_drvdata(pdev, info); - ret = of_platform_populate(np, rockchip_bank_match, NULL, NULL); + ret = of_platform_populate(np, NULL, NULL, &pdev->dev); if (ret) { dev_err(&pdev->dev, "failed to register gpio device\n"); return ret; |