V4L/DVB (12515): soc-camera: use struct v4l2_rect in struct soc_camera_device

[deliverable/linux.git] / drivers / media / video / mt9v022.c

diff --git a/drivers/media/video/mt9v022.c b/drivers/media/video/mt9v022.c
index 3cb9f0f1e256296622ba91b37193beb4561f3401..d2b0981ec1c11fbb9e3a2b5deb4c179530f2f1cc 100644 (file)
--- a/drivers/media/video/mt9v022.c
+++ b/drivers/media/video/mt9v022.c
@@ -298,8 +298,8 @@ static int mt9v022_s_fmt(struct v4l2_subdev *sd, struct v4l2_format *f)
        struct soc_camera_device *icd = client->dev.platform_data;
        struct v4l2_pix_format *pix = &f->fmt.pix;
        struct v4l2_rect rect = {
-               .left   = icd->x_current,
-               .top    = icd->y_current,
+               .left   = icd->rect_current.left,
+               .top    = icd->rect_current.top,
                .width  = pix->width,
                .height = pix->height,
        };
@@ -741,16 +741,16 @@ static int mt9v022_probe(struct i2c_client *client,
 
        mt9v022->chip_control = MT9V022_CHIP_CONTROL_DEFAULT;
 
-       icd->ops        = &mt9v022_ops;
-       icd->x_min      = 1;
-       icd->y_min      = 4;
-       icd->x_current  = 1;
-       icd->y_current  = 4;
-       icd->width_min  = 48;
-       icd->width_max  = 752;
-       icd->height_min = 32;
-       icd->height_max = 480;
-       icd->y_skip_top = 1;
+       icd->ops                = &mt9v022_ops;
+       icd->rect_max.left      = 1;
+       icd->rect_max.top       = 4;
+       icd->rect_max.width     = 752;
+       icd->rect_max.height    = 480;
+       icd->rect_current.left  = 1;
+       icd->rect_current.top   = 4;
+       icd->width_min          = 48;
+       icd->height_min         = 32;
+       icd->y_skip_top         = 1;
 
        ret = mt9v022_video_probe(icd, client);
        if (ret) {