Merge tag 'stable/for-linus-3.6-rc3-tag' of git://git.kernel.org/pub/scm/linux/kernel...

[mirror_ubuntu-bionic-kernel.git] / drivers / video / sh_mobile_lcdcfb.c

diff --git a/drivers/video/sh_mobile_lcdcfb.c b/drivers/video/sh_mobile_lcdcfb.c
index 8cb653b107cc75fe4c7f0edc49b4ecbad6ed5da5..699487c287b2b201a0d2d263aeadbcfa250a0f92 100644 (file)
--- a/drivers/video/sh_mobile_lcdcfb.c
+++ b/drivers/video/sh_mobile_lcdcfb.c
@@ -1716,11 +1716,11 @@ sh_mobile_lcdc_overlay_fb_init(struct sh_mobile_lcdc_overlay *ovl)
                info->fix.visual = FB_VISUAL_TRUECOLOR;
 
        switch (ovl->format->fourcc) {
-       case V4L2_PIX_FMT_NV16:
-       case V4L2_PIX_FMT_NV61:
-               info->fix.ypanstep = 2;
        case V4L2_PIX_FMT_NV12:
        case V4L2_PIX_FMT_NV21:
+               info->fix.ypanstep = 2;
+       case V4L2_PIX_FMT_NV16:
+       case V4L2_PIX_FMT_NV61:
                info->fix.xpanstep = 2;
        }
 
@@ -2215,11 +2215,11 @@ sh_mobile_lcdc_channel_fb_init(struct sh_mobile_lcdc_chan *ch,
                info->fix.visual = FB_VISUAL_TRUECOLOR;
 
        switch (ch->format->fourcc) {
-       case V4L2_PIX_FMT_NV16:
-       case V4L2_PIX_FMT_NV61:
-               info->fix.ypanstep = 2;
        case V4L2_PIX_FMT_NV12:
        case V4L2_PIX_FMT_NV21:
+               info->fix.ypanstep = 2;
+       case V4L2_PIX_FMT_NV16:
+       case V4L2_PIX_FMT_NV61:
                info->fix.xpanstep = 2;
        }