From ca901e4e507b99b6af1134d449bb4015924a1efb Mon Sep 17 00:00:00 2001 From: Sylwester Nawrocki Date: Tue, 23 Apr 2013 12:40:24 -0300 Subject: [PATCH] --- yaml --- r: 367103 b: refs/heads/master c: cbd53542ca35842127c6f581fefbb0a7dd2b4a21 h: refs/heads/master i: 367101: 662aff17c94f3f8678c5e3fa2c9192e1127bad40 367099: eb1fc3e1a80bbc63a7f638a3ab6136f4eab253fb 367095: f87f47e3ed1e5320f5e5ea47371d252a3d6f2a08 367087: 22daa6a916e3ef4af1f9589e7022220ca1c4b463 367071: 85c7d30406e83a8119bc0b2cbfbf899aaab91fbd 367039: d1fbb4ecf79a4563de116d4c17d2a530ce14c337 366975: 3d45607541bafbaf78262ec49e5fdbca433ae1ee 366847: bed8d798dac0688e7a7d73cc55b8330d44ad154d 366591: 93d68ee0c06c8246a6206caacffde8e4f1d19ca9 v: v3 --- [refs] | 2 +- .../drivers/media/platform/exynos4-is/mipi-csis.c | 14 ++++---------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index d7eb122e7683..d76156f3402c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: aceb59ed3438dcb2f5c90e2f62f0f9edde4091d2 +refs/heads/master: cbd53542ca35842127c6f581fefbb0a7dd2b4a21 diff --git a/trunk/drivers/media/platform/exynos4-is/mipi-csis.c b/trunk/drivers/media/platform/exynos4-is/mipi-csis.c index 8636bcddde1b..a2eda9d5ac87 100644 --- a/trunk/drivers/media/platform/exynos4-is/mipi-csis.c +++ b/trunk/drivers/media/platform/exynos4-is/mipi-csis.c @@ -549,10 +549,10 @@ static struct csis_pix_format const *s5pcsis_try_format( static struct v4l2_mbus_framefmt *__s5pcsis_get_format( struct csis_state *state, struct v4l2_subdev_fh *fh, - u32 pad, enum v4l2_subdev_format_whence which) + enum v4l2_subdev_format_whence which) { if (which == V4L2_SUBDEV_FORMAT_TRY) - return fh ? v4l2_subdev_get_try_format(fh, pad) : NULL; + return fh ? v4l2_subdev_get_try_format(fh, 0) : NULL; return &state->format; } @@ -564,10 +564,7 @@ static int s5pcsis_set_fmt(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh, struct csis_pix_format const *csis_fmt; struct v4l2_mbus_framefmt *mf; - if (fmt->pad != CSIS_PAD_SOURCE && fmt->pad != CSIS_PAD_SINK) - return -EINVAL; - - mf = __s5pcsis_get_format(state, fh, fmt->pad, fmt->which); + mf = __s5pcsis_get_format(state, fh, fmt->which); if (fmt->pad == CSIS_PAD_SOURCE) { if (mf) { @@ -594,10 +591,7 @@ static int s5pcsis_get_fmt(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh, struct csis_state *state = sd_to_csis_state(sd); struct v4l2_mbus_framefmt *mf; - if (fmt->pad != CSIS_PAD_SOURCE && fmt->pad != CSIS_PAD_SINK) - return -EINVAL; - - mf = __s5pcsis_get_format(state, fh, fmt->pad, fmt->which); + mf = __s5pcsis_get_format(state, fh, fmt->which); if (!mf) return -EINVAL;