diff options
| author | Robby Cai <R63905@freescale.com> | 2013-07-15 18:50:09 +0800 |
|---|---|---|
| committer | Robby Cai <R63905@freescale.com> | 2013-07-18 18:47:10 +0800 |
| commit | 3d72fd5d3a7ba51786bb8020242f3aa9152e0a08 (patch) | |
| tree | 1a24285a22b0b88d9bc5dee9161f46d0c36eccd4 | |
| parent | 1c9f52d1ef7f67c26144da4ab9d893e020dedd4e (diff) | |
ENGR00271053-2 mx6sl: csi/v4l2: add strict check for crop setting
add the strict check for crop setting in S_CROP ioctl
Signed-off-by: Robby Cai <R63905@freescale.com>
| -rw-r--r-- | drivers/media/video/mxc/capture/csi_v4l2_capture.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/drivers/media/video/mxc/capture/csi_v4l2_capture.c b/drivers/media/video/mxc/capture/csi_v4l2_capture.c index 48d2278789e0..6574ca7d95b7 100644 --- a/drivers/media/video/mxc/capture/csi_v4l2_capture.c +++ b/drivers/media/video/mxc/capture/csi_v4l2_capture.c @@ -1370,6 +1370,22 @@ static long csi_v4l_do_ioctl(struct file *file, break; } + crop->c.top = (crop->c.top < b->top) ? b->top + : crop->c.top; + if (crop->c.top > b->top + b->height) + crop->c.top = b->top + b->height - 1; + if (crop->c.height > b->top + b->height - crop->c.top) + crop->c.height = + b->top + b->height - crop->c.top; + + crop->c.left = (crop->c.left < b->left) ? b->left + : crop->c.left; + if (crop->c.left > b->left + b->width) + crop->c.left = b->left + b->width - 1; + if (crop->c.width > b->left - crop->c.left + b->width) + crop->c.width = + b->left - crop->c.left + b->width; + crop->c.width -= crop->c.width % 8; crop->c.height -= crop->c.height % 8; |