diff options
| author |   Paolo Abeni <pabeni@redhat.com> | 2022-04-22 09:56:00 +0200 |
|---|---|---|
| committer | Paolo Abeni <pabeni@redhat.com> | 2022-04-22 09:56:00 +0200 |
| commit | f70925bf99406150d8133e775e49c9c459f78733 (patch) | |
| tree | 392dd3854bf229c0c94b481819e4a67551ba6895 /drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c | |
| parent | net: eql: Use kzalloc instead of kmalloc/memset (diff) | |
| parent | Merge tag 'net-5.18-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net (diff) | |
| download | linux-dev-f70925bf99406150d8133e775e49c9c459f78733.tar.xz linux-dev-f70925bf99406150d8133e775e49c9c459f78733.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
drivers/net/ethernet/microchip/lan966x/lan966x_main.c
d08ed852560e ("net: lan966x: Make sure to release ptp interrupt")
c8349639324a ("net: lan966x: Add FDMA functionality")
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c')
| -rw-r--r-- | drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c index 1ee824600995..c478d25f7825 100644 --- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c +++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c @@ -98,7 +98,10 @@ static void mdp5_plane_reset(struct drm_plane *plane) __drm_atomic_helper_plane_destroy_state(plane->state); kfree(to_mdp5_plane_state(plane->state)); + plane->state = NULL; mdp5_state = kzalloc(sizeof(*mdp5_state), GFP_KERNEL); + if (!mdp5_state) + return; __drm_atomic_helper_plane_reset(plane, &mdp5_state->base); } |