Merge drm/drm-next into drm-misc-next

[linux-2.6-microblaze.git] / drivers / gpu / drm / gud / gud_pipe.c

diff --git a/drivers/gpu/drm/gud/gud_pipe.c b/drivers/gpu/drm/gud/gud_pipe.c
index 28171de..e163649 100644 (file)
--- a/drivers/gpu/drm/gud/gud_pipe.c
+++ b/drivers/gpu/drm/gud/gud_pipe.c
@@ -509,7 +509,7 @@ int gud_pipe_check(struct drm_simple_display_pipe *pipe,
                return -ENOENT;
 
        len = struct_size(req, properties,
-                         GUD_PROPERTIES_MAX_NUM + GUD_CONNECTOR_PROPERTIES_MAX_NUM);
+                         size_add(GUD_PROPERTIES_MAX_NUM, GUD_CONNECTOR_PROPERTIES_MAX_NUM));
        req = kzalloc(len, GFP_KERNEL);
        if (!req)
                return -ENOMEM;