]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
staging: imx-drm: fix indentation warning
authorArnd Bergmann <arnd@arndb.de>
Thu, 4 May 2017 20:52:00 +0000 (22:52 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 8 May 2017 05:44:11 +0000 (07:44 +0200)
gcc-6 produces a harmless warning:

drivers/staging/imx-drm/imx-hdmi.c: In function 'hdmi_config_AVI':
drivers/staging/imx-drm/imx-hdmi.c:967:2: error: this 'else' clause does not guard... [-Werror=misleading-indentation]

Commit d083c312cba2 ("drm: bridge/dw_hdmi: simplify hdmi_config_AVI() a little")
in linux-4.3 fixes this with a larger rewrite that is not applicable here.
After that rewrite, the variable that gets assigned here no longer exists.

The assignment is rather pointless here, as we just set a variable to zero
that is later added into another variable using a bitwise or operator, and
that has no effect, so I'm just changing the indentation here to shut up
the warning.

The driver was originally merged in linux-3.13, and the fix applies
to all versions between that and 4.2.

Fixes: 9aaf880ed4ee ("imx-drm: Add mx6 hdmi transmitter support")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/imx-drm/imx-hdmi.c

index aaec6b2cdf562f32c86e981555eef949c9901a2e..f1475ac718e91ce8d6f00b804f1a37310843c933 100644 (file)
@@ -967,7 +967,7 @@ static void hdmi_config_AVI(struct imx_hdmi *hdmi)
        else
                pix_fmt = HDMI_FC_AVICONF0_PIX_FMT_RGB;
 
-               under_scan =  HDMI_FC_AVICONF0_SCAN_INFO_NODATA;
+       under_scan =  HDMI_FC_AVICONF0_SCAN_INFO_NODATA;
 
        /*
         * Active format identification data is present in the AVI InfoFrame.