diff options
author | Ingo Molnar <mingo@kernel.org> | 2023-10-23 12:32:25 +0300 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2023-10-23 12:32:25 +0300 |
commit | 4e5b65a22ba0cabe58f895cd797cb10a763d6994 (patch) | |
tree | 067033eb0d1d284b6ca89c2bfa4034906ff59ad9 /drivers/gpu/drm/tiny/simpledrm.c | |
parent | 4c456c9ad334a940e354da1002184bc19f4493ef (diff) | |
parent | 05d3ef8bba77c1b5f98d941d8b2d4aeab8118ef1 (diff) | |
download | linux-4e5b65a22ba0cabe58f895cd797cb10a763d6994.tar.xz |
Merge tag 'v6.6-rc7' into sched/core, to pick up fixes
Pick up recent sched/urgent fixes merged upstream.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/gpu/drm/tiny/simpledrm.c')
-rw-r--r-- | drivers/gpu/drm/tiny/simpledrm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/tiny/simpledrm.c b/drivers/gpu/drm/tiny/simpledrm.c index ff86ba1ae1b8..8ea120eb8674 100644 --- a/drivers/gpu/drm/tiny/simpledrm.c +++ b/drivers/gpu/drm/tiny/simpledrm.c @@ -745,7 +745,7 @@ static struct simpledrm_device *simpledrm_device_create(struct drm_driver *drv, ret = devm_aperture_acquire_from_firmware(dev, res->start, resource_size(res)); if (ret) { - drm_err(dev, "could not acquire memory range %pr: %d\n", &res, ret); + drm_err(dev, "could not acquire memory range %pr: %d\n", res, ret); return ERR_PTR(ret); } |