summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChen-Yu Tsai <wens@csie.org>2017-02-23 16:05:35 +0800
committerMaxime Ripard <maxime.ripard@free-electrons.com>2017-03-07 22:15:16 +0100
commit2b2c22bf1c7017d8b4ac088c33b58fae4786d569 (patch)
tree92e839ebd98c9701b77bd31324f98a0db1b78de3
parent7544860733d158e3edbf309f27e79e258c8f66bd (diff)
downloadlinux-stable-2b2c22bf1c7017d8b4ac088c33b58fae4786d569.tar.gz
linux-stable-2b2c22bf1c7017d8b4ac088c33b58fae4786d569.tar.bz2
linux-stable-2b2c22bf1c7017d8b4ac088c33b58fae4786d569.zip
drm/sun4i: Add end of list element for sun4i_layers_init's returned list
The number of defined planes in sun4i_layer is unknown to other parts of the sun4i drm driver. Since the return value of sun4i_layers_init is a list of layers, make it return 1 more empty layer as an end of list guard value. Signed-off-by: Chen-Yu Tsai <wens@csie.org> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
-rw-r--r--drivers/gpu/drm/sun4i/sun4i_layer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/sun4i/sun4i_layer.c b/drivers/gpu/drm/sun4i/sun4i_layer.c
index 41bc0f860f5c..0b703fb02656 100644
--- a/drivers/gpu/drm/sun4i/sun4i_layer.c
+++ b/drivers/gpu/drm/sun4i/sun4i_layer.c
@@ -139,7 +139,7 @@ struct sun4i_layer **sun4i_layers_init(struct drm_device *drm)
struct sun4i_layer **layers;
int i;
- layers = devm_kcalloc(drm->dev, ARRAY_SIZE(sun4i_backend_planes),
+ layers = devm_kcalloc(drm->dev, ARRAY_SIZE(sun4i_backend_planes) + 1,
sizeof(*layers), GFP_KERNEL);
if (!layers)
return ERR_PTR(-ENOMEM);