diff options
author | 2023-05-09 15:03:40 +0200 | |
---|---|---|
committer | 2023-05-09 15:03:40 +0200 | |
commit | ff32fcca64437f679a2bf1c0a19d5def389a18e2 (patch) | |
tree | 122863d5d6159b30fd6834cbe599f8ce1b9e8144 /drivers/gpu/drm/armada | |
parent | MAINTAINERS: Add Maira to VKMS maintainers (diff) | |
parent | Linux 6.4-rc1 (diff) | |
download | linux-ff32fcca64437f679a2bf1c0a19d5def389a18e2.tar.gz linux-ff32fcca64437f679a2bf1c0a19d5def389a18e2.tar.bz2 linux-ff32fcca64437f679a2bf1c0a19d5def389a18e2.zip |
Merge drm/drm-next into drm-misc-next
Start the 6.5 release cycle.
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Diffstat (limited to 'drivers/gpu/drm/armada')
-rw-r--r-- | drivers/gpu/drm/armada/armada_drv.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/armada/armada_drv.c b/drivers/gpu/drm/armada/armada_drv.c index 22efd0f29521..e120144d4b47 100644 --- a/drivers/gpu/drm/armada/armada_drv.c +++ b/drivers/gpu/drm/armada/armada_drv.c @@ -97,7 +97,6 @@ static int armada_drm_bind(struct device *dev) if (ret) { dev_err(dev, "[" DRM_NAME ":%s] can't kick out simple-fb: %d\n", __func__, ret); - kfree(priv); return ret; } |