diff options
author | Richard Liu <r66033@freescale.com> | 2012-01-04 17:32:07 +0800 |
---|---|---|
committer | Richard Liu <r66033@freescale.com> | 2012-01-04 17:39:58 +0800 |
commit | 14756033551d00d2c04f2f2dec835f215d48ea74 (patch) | |
tree | 99898acc50ead4005c80b9ec4e1ec3202f9a8a09 | |
parent | ed6b49c61bc5e7f07ac046acb53205ee395c1e71 (diff) |
ENGR00171269 fix gingerbread camera cts fail.
fix gingerbread camera cts fail.
Signed-off-by: Richard Liu <r66033@freescale.com>
-rw-r--r-- | drivers/media/video/mxc/capture/ov5642.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/media/video/mxc/capture/ov5642.c b/drivers/media/video/mxc/capture/ov5642.c index 132884b766bf..0c942085d4e7 100644 --- a/drivers/media/video/mxc/capture/ov5642.c +++ b/drivers/media/video/mxc/capture/ov5642.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011 Freescale Semiconductor, Inc. All Rights Reserved. + * Copyright (C) 2012 Freescale Semiconductor, Inc. All Rights Reserved. */ /* @@ -2293,6 +2293,8 @@ static int ioctl_s_parm(struct v4l2_int_device *s, struct v4l2_streamparm *a) } ret = ov5642_change_mode(frame_rate, a->parm.capture.capturemode, sensor->streamcap.capturemode); + if (ret < 0) + return ret; sensor->streamcap.timeperframe = *timeperframe; sensor->streamcap.capturemode = (u32)a->parm.capture.capturemode; |