diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-02-08 11:09:27 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-02-08 11:09:27 +0300 |
| commit | d8c849037d9398abe6a5f5d065eafc777eb3bdaf (patch) | |
| tree | 2ebe56d73c84619214ee9e131c586ad98b817e81 /drivers/bus/simple-pm-bus.c | |
| parent | 8cf9045b91382df9fb1eb420daa4d1c2697d2f44 (diff) | |
| parent | 92bf22614b21a2706f4993b278017e437f7785b3 (diff) | |
| download | linux-d8c849037d9398abe6a5f5d065eafc777eb3bdaf.tar.xz | |
Merge 5.11-rc7 into usb-next
We need the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/bus/simple-pm-bus.c')
| -rw-r--r-- | drivers/bus/simple-pm-bus.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/bus/simple-pm-bus.c b/drivers/bus/simple-pm-bus.c index c5eb46cbf388..01a3d0cd08ed 100644 --- a/drivers/bus/simple-pm-bus.c +++ b/drivers/bus/simple-pm-bus.c @@ -16,6 +16,7 @@ static int simple_pm_bus_probe(struct platform_device *pdev) { + const struct of_dev_auxdata *lookup = dev_get_platdata(&pdev->dev); struct device_node *np = pdev->dev.of_node; dev_dbg(&pdev->dev, "%s\n", __func__); @@ -23,7 +24,7 @@ static int simple_pm_bus_probe(struct platform_device *pdev) pm_runtime_enable(&pdev->dev); if (np) - of_platform_populate(np, NULL, NULL, &pdev->dev); + of_platform_populate(np, NULL, lookup, &pdev->dev); return 0; } |