KARO: cleanup after merge of Freescale 3.10.17 stuff

[karo-tx-linux.git] / drivers / media / platform / mxc / output / mxc_pxp_v4l2.c

diff --git a/drivers/media/platform/mxc/output/mxc_pxp_v4l2.c b/drivers/media/platform/mxc/output/mxc_pxp_v4l2.c
index dc078320acb0133c039d1075c4fc0af6dcb2a902..7b7629b8cb82bd66df3b1b17ef4c8f21e5baf699 100644 (file)
--- a/drivers/media/platform/mxc/output/mxc_pxp_v4l2.c
+++ b/drivers/media/platform/mxc/output/mxc_pxp_v4l2.c
@@ -602,9 +602,9 @@ static int pxp_try_fmt_output_overlay(struct file *file, void *fh,
        wf->w.left = srect.left;
        wf->w.top = srect.top;
        wf->w.width = min(srect.width,
-                       ((__s32)pxp->pxp_conf.s0_param.width - wf->w.left));
+                       ((__u32)pxp->pxp_conf.s0_param.width - wf->w.left));
        wf->w.height = min(srect.height,
-                       ((__s32)pxp->pxp_conf.s0_param.height - wf->w.top));
+                       ((__u32)pxp->pxp_conf.s0_param.height - wf->w.top));
 
        return 0;
 }