diff options
author | Dave Airlie <airlied@redhat.com> | 2021-07-26 02:27:59 +0300 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2021-07-26 02:27:59 +0300 |
commit | 35482f9dc56b9bd0f179106da7e461f6c2a2d891 (patch) | |
tree | b04c95e464c3724b5b5b0ba50ad4a26886b2497a /drivers/gpu/drm/panel | |
parent | 8da49a33dda7294c1af508f8aa81cd638d0afd62 (diff) | |
parent | ff1176468d368232b684f75e82563369208bc371 (diff) | |
download | linux-35482f9dc56b9bd0f179106da7e461f6c2a2d891.tar.xz |
Backmerge tag 'v5.14-rc3' into drm-next
Linux 5.14-rc3
Daniel said we should pull the nouveau fix from fixes in here, probably
a good plan.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/panel')
-rw-r--r-- | drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c b/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c index 2229f1af2ca8..46029c5610c8 100644 --- a/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c +++ b/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c @@ -447,7 +447,6 @@ static int rpi_touchscreen_remove(struct i2c_client *i2c) drm_panel_remove(&ts->base); mipi_dsi_device_unregister(ts->dsi); - kfree(ts->dsi); return 0; } |