summaryrefslogtreecommitdiffstats
path: root/drivers/media/platform/davinci
diff options
context:
space:
mode:
authorMauro Carvalho Chehab2018-04-06 14:05:41 +0200
committerMauro Carvalho Chehab2018-04-17 11:28:47 +0200
commit3022b9887068e062e078d70ab0d090abfd0ccfe1 (patch)
tree1f303605a2179ae6a8253ab6193fdaf3684dd333 /drivers/media/platform/davinci
parentmedia: isif: reorder a statement to match coding style (diff)
downloadkernel-qcow2-linux-3022b9887068e062e078d70ab0d090abfd0ccfe1.tar.gz
kernel-qcow2-linux-3022b9887068e062e078d70ab0d090abfd0ccfe1.tar.xz
kernel-qcow2-linux-3022b9887068e062e078d70ab0d090abfd0ccfe1.zip
media: davinci: fix an inconsistent ident
drivers/media/platform/davinci/vpbe_osd.c:849 try_layer_config() warn: inconsistent indenting Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'drivers/media/platform/davinci')
-rw-r--r--drivers/media/platform/davinci/vpbe_osd.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/media/platform/davinci/vpbe_osd.c b/drivers/media/platform/davinci/vpbe_osd.c
index 99a4ec183ba9..7f610320426d 100644
--- a/drivers/media/platform/davinci/vpbe_osd.c
+++ b/drivers/media/platform/davinci/vpbe_osd.c
@@ -846,9 +846,10 @@ static int try_layer_config(struct osd_state *sd, enum osd_layer layer,
/* DM6446: */
/* only one OSD window at a time can use RGB pixel formats */
- if ((osd->vpbe_type == VPBE_VERSION_1) &&
- is_osd_win(layer) && is_rgb_pixfmt(lconfig->pixfmt)) {
+ if ((osd->vpbe_type == VPBE_VERSION_1) &&
+ is_osd_win(layer) && is_rgb_pixfmt(lconfig->pixfmt)) {
enum osd_pix_format pixfmt;
+
if (layer == WIN_OSD0)
pixfmt = osd->win[WIN_OSD1].lconfig.pixfmt;
else