From f9666efd7f96e1e56e5716fed970bf2908bbcef2 Mon Sep 17 00:00:00 2001 From: Sylwester Nawrocki Date: Wed, 26 Sep 2012 05:45:21 -0300 Subject: [PATCH] --- yaml --- r: 331236 b: refs/heads/master c: 94c15b5e6755711af6dd81bde0f8396e24b75dc2 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/i2c/s5k6aa.c | 11 ++++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 2e38676da6cf..5d5448a00733 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7fb89eca0f2ad21f6e77f3411cb220ed94f340df +refs/heads/master: 94c15b5e6755711af6dd81bde0f8396e24b75dc2 diff --git a/trunk/drivers/media/i2c/s5k6aa.c b/trunk/drivers/media/i2c/s5k6aa.c index 045ca7f4f6ca..57cd4fa0193d 100644 --- a/trunk/drivers/media/i2c/s5k6aa.c +++ b/trunk/drivers/media/i2c/s5k6aa.c @@ -1061,10 +1061,9 @@ __s5k6aa_get_crop_rect(struct s5k6aa *s5k6aa, struct v4l2_subdev_fh *fh, { if (which == V4L2_SUBDEV_FORMAT_ACTIVE) return &s5k6aa->ccd_rect; - if (which == V4L2_SUBDEV_FORMAT_TRY) - return v4l2_subdev_get_try_crop(fh, 0); - return NULL; + WARN_ON(which != V4L2_SUBDEV_FORMAT_TRY); + return v4l2_subdev_get_try_crop(fh, 0); } static void s5k6aa_try_format(struct s5k6aa *s5k6aa, @@ -1169,12 +1168,10 @@ static int s5k6aa_get_crop(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh, struct v4l2_rect *rect; memset(crop->reserved, 0, sizeof(crop->reserved)); - mutex_lock(&s5k6aa->lock); + mutex_lock(&s5k6aa->lock); rect = __s5k6aa_get_crop_rect(s5k6aa, fh, crop->which); - if (rect) - crop->rect = *rect; - + crop->rect = *rect; mutex_unlock(&s5k6aa->lock); v4l2_dbg(1, debug, sd, "Current crop rectangle: (%d,%d)/%dx%d\n",