7 files changed, 26 insertions, 26 deletions

diff --git a/drivers/media/pci/bt8xx/bttv-driver.c b/drivers/media/pci/bt8xx/bttv-driver.c
index 31b282667463..16f5ca23698c 100644
--- a/drivers/media/pci/bt8xx/bttv-driver.c
+++ b/drivers/media/pci/bt8xx/bttv-driver.c
@@ -2986,7 +2986,7 @@ static int bttv_g_crop(struct file *file, void *f, struct v4l2_crop *crop)
         return 0;
 }
 
-static int bttv_s_crop(struct file *file, void *f, struct v4l2_crop *crop)
+static int bttv_s_crop(struct file *file, void *f, const struct v4l2_crop *crop)
 {
         struct bttv_fh *fh = f;
         struct bttv *btv = fh->btv;
@@ -3028,17 +3028,17 @@ static int bttv_s_crop(struct file *file, void *f, struct v4l2_crop *crop)
         }
 
         /* Min. scaled size 48 x 32. */
-        c.rect.left = clamp(crop->c.left, b_left, b_right - 48);
+        c.rect.left = clamp_t(s32, crop->c.left, b_left, b_right - 48);
         c.rect.left = min(c.rect.left, (__s32) MAX_HDELAY);
 
-        c.rect.width = clamp(crop->c.width,
+        c.rect.width = clamp_t(s32, crop->c.width,
                              48, b_right - c.rect.left);
 
-        c.rect.top = clamp(crop->c.top, b_top, b_bottom - 32);
+        c.rect.top = clamp_t(s32, crop->c.top, b_top, b_bottom - 32);
         /* Top and height must be a multiple of two. */
         c.rect.top = (c.rect.top + 1) & ~1;
 
-        c.rect.height = clamp(crop->c.height,
+        c.rect.height = clamp_t(s32, crop->c.height,
                               32, b_bottom - c.rect.top);
         c.rect.height = (c.rect.height + 1) & ~1;
 
diff --git a/drivers/media/pci/cx18/cx18-ioctl.c b/drivers/media/pci/cx18/cx18-ioctl.c
index ff315446d4ad..bb5073f72c42 100644
--- a/drivers/media/pci/cx18/cx18-ioctl.c
+++ b/drivers/media/pci/cx18/cx18-ioctl.c
@@ -527,7 +527,7 @@ static int cx18_cropcap(struct file *file, void *fh,
         return 0;
 }
 
-static int cx18_s_crop(struct file *file, void *fh, struct v4l2_crop *crop)
+static int cx18_s_crop(struct file *file, void *fh, const struct v4l2_crop *crop)
 {
         struct cx18_open_id *id = fh2id(fh);
         struct cx18 *cx = id->cx;
diff --git a/drivers/media/pci/cx25821/cx25821-video.c b/drivers/media/pci/cx25821/cx25821-video.c
index b38d4379cc36..0a80245165d0 100644
--- a/drivers/media/pci/cx25821/cx25821-video.c
+++ b/drivers/media/pci/cx25821/cx25821-video.c
@@ -1610,7 +1610,7 @@ int cx25821_vidioc_cropcap(struct file *file, void *priv,
         return 0;
 }
 
-int cx25821_vidioc_s_crop(struct file *file, void *priv, struct v4l2_crop *crop)
+int cx25821_vidioc_s_crop(struct file *file, void *priv, const struct v4l2_crop *crop)
 {
         struct cx25821_dev *dev = ((struct cx25821_fh *)priv)->dev;
         struct cx25821_fh *fh = priv;
diff --git a/drivers/media/pci/cx25821/cx25821-video.h b/drivers/media/pci/cx25821/cx25821-video.h
index 9652a5e35ba2..c265e35b37c3 100644
--- a/drivers/media/pci/cx25821/cx25821-video.h
+++ b/drivers/media/pci/cx25821/cx25821-video.h
@@ -177,7 +177,7 @@ extern int cx25821_set_control(struct cx25821_dev *dev,
 extern int cx25821_vidioc_cropcap(struct file *file, void *fh,
                                   struct v4l2_cropcap *cropcap);
 extern int cx25821_vidioc_s_crop(struct file *file, void *priv,
-                                 struct v4l2_crop *crop);
+                                 const struct v4l2_crop *crop);
 extern int cx25821_vidioc_g_crop(struct file *file, void *priv,
                                  struct v4l2_crop *crop);
 
diff --git a/drivers/media/pci/ivtv/ivtv-ioctl.c b/drivers/media/pci/ivtv/ivtv-ioctl.c
index d5cbb6177754..ed6dcc7e61bc 100644
--- a/drivers/media/pci/ivtv/ivtv-ioctl.c
+++ b/drivers/media/pci/ivtv/ivtv-ioctl.c
@@ -874,7 +874,7 @@ static int ivtv_cropcap(struct file *file, void *fh, struct v4l2_cropcap *cropca
         return 0;
 }
 
-static int ivtv_s_crop(struct file *file, void *fh, struct v4l2_crop *crop)
+static int ivtv_s_crop(struct file *file, void *fh, const struct v4l2_crop *crop)
 {
         struct ivtv_open_id *id = fh2id(fh);
         struct ivtv *itv = id->itv;
diff --git a/drivers/media/pci/saa7134/saa7134-video.c b/drivers/media/pci/saa7134/saa7134-video.c
index 135bfd8c28ad..22f8758d047f 100644
--- a/drivers/media/pci/saa7134/saa7134-video.c
+++ b/drivers/media/pci/saa7134/saa7134-video.c
@@ -1953,11 +1953,12 @@ static int saa7134_g_crop(struct file *file, void *f, struct v4l2_crop *crop)
         return 0;
 }
 
-static int saa7134_s_crop(struct file *file, void *f, struct v4l2_crop *crop)
+static int saa7134_s_crop(struct file *file, void *f, const struct v4l2_crop *crop)
 {
         struct saa7134_fh *fh = f;
         struct saa7134_dev *dev = fh->dev;
         struct v4l2_rect *b = &dev->crop_bounds;
+        struct v4l2_rect *c = &dev->crop_current;
 
         if (crop->type != V4L2_BUF_TYPE_VIDEO_CAPTURE &&
             crop->type != V4L2_BUF_TYPE_VIDEO_OVERLAY)
@@ -1972,21 +1973,20 @@ static int saa7134_s_crop(struct file *file, void *f, struct v4l2_crop *crop)
         if (res_locked(fh->dev, RESOURCE_VIDEO))
                 return -EBUSY;
 
-        if (crop->c.top < b->top)
-                crop->c.top = b->top;
-        if (crop->c.top > b->top + b->height)
-                crop->c.top = b->top + b->height;
-        if (crop->c.height > b->top - crop->c.top + b->height)
-                crop->c.height = b->top - crop->c.top + b->height;
-
-        if (crop->c.left < b->left)
-                crop->c.left = b->left;
-        if (crop->c.left > b->left + b->width)
-                crop->c.left = b->left + b->width;
-        if (crop->c.width > b->left - crop->c.left + b->width)
-                crop->c.width = b->left - crop->c.left + b->width;
-
-        dev->crop_current = crop->c;
+        *c = crop->c;
+        if (c->top < b->top)
+                c->top = b->top;
+        if (c->top > b->top + b->height)
+                c->top = b->top + b->height;
+        if (c->height > b->top - c->top + b->height)
+                c->height = b->top - c->top + b->height;
+
+        if (c->left < b->left)
+                c->left = b->left;
+        if (c->left > b->left + b->width)
+                c->left = b->left + b->width;
+        if (c->width > b->left - c->left + b->width)
+                c->width = b->left - c->left + b->width;
         return 0;
 }
 
diff --git a/drivers/media/pci/zoran/zoran_driver.c b/drivers/media/pci/zoran/zoran_driver.c
index 9ecd7d711f27..53f12c7466b0 100644
--- a/drivers/media/pci/zoran/zoran_driver.c
+++ b/drivers/media/pci/zoran/zoran_driver.c
@@ -2598,7 +2598,7 @@ gcrop_unlock_and_return:
         return res;
 }
 
-static int zoran_s_crop(struct file *file, void *__fh, struct v4l2_crop *crop)
+static int zoran_s_crop(struct file *file, void *__fh, const struct v4l2_crop *crop)
 {
         struct zoran_fh *fh = __fh;
         struct zoran *zr = fh->zr;