drm/sun4i: Fix a return value in case of error
authorChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Fri, 18 Nov 2016 18:18:47 +0000 (19:18 +0100)
committerMaxime Ripard <maxime.ripard@free-electrons.com>
Mon, 2 Jan 2017 21:27:58 +0000 (22:27 +0100)
If 'sun4i_backend_drm_format_to_layer()' does not return 0, then 'val' is
left unmodified.
As it is not initialized either, the return value can be anything.

It is likely that returning the error code was expected here.

As the only caller of 'sun4i_backend_update_layer_formats()' does not check
the return value, this fix is purely theorical.

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
drivers/gpu/drm/sun4i/sun4i_backend.c

index 2e08f969bb64e796061b6fbdce3c061a0eaae375..5bf1ea4d92fcfc4a6389bcec016d73a448da8df8 100644 (file)
@@ -192,7 +192,7 @@ int sun4i_backend_update_layer_formats(struct sun4i_backend *backend,
        ret = sun4i_backend_drm_format_to_layer(plane, fb->pixel_format, &val);
        if (ret) {
                DRM_DEBUG_DRIVER("Invalid format\n");
-               return val;
+               return ret;
        }
 
        regmap_update_bits(backend->regs, SUN4I_BACKEND_ATTCTL_REG1(layer),