diff --git a/[refs] b/[refs] index 015939353ebe..c9847e1ac70b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 91d1cfa8779e1929167a7cf1e5825462af7d6e4a +refs/heads/master: ac33a207b13a70bbca6e58094e28bd92b9fc1ff3 diff --git a/trunk/drivers/video/sh_mobile_lcdcfb.c b/trunk/drivers/video/sh_mobile_lcdcfb.c index 8cb653b107cc..699487c287b2 100644 --- a/trunk/drivers/video/sh_mobile_lcdcfb.c +++ b/trunk/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; }