From: ddl Date: Wed, 4 May 2011 07:58:40 +0000 (+0800) Subject: camera: fix sensor default resolution return error when user resolution isn't catch X-Git-Tag: firefly_0821_release~10368 X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=0405300362320b0506c3024da16b42d35efcd2e9;p=firefly-linux-kernel-4.4.55.git camera: fix sensor default resolution return error when user resolution isn't catch --- diff --git a/drivers/media/video/gc0308.c b/drivers/media/video/gc0308.c index c2db1478d111..a2d345978b3c 100755 --- a/drivers/media/video/gc0308.c +++ b/drivers/media/video/gc0308.c @@ -1961,8 +1961,7 @@ static int sensor_s_fmt(struct v4l2_subdev *sd, struct v4l2_format *f) { winseqe_set_addr = SENSOR_INIT_WINSEQADR; /* ddl@rock-chips.com : Sensor output smallest size if isn't support app */ set_w = SENSOR_INIT_WIDTH; - set_h = SENSOR_INIT_HEIGHT; - ret = -1; + set_h = SENSOR_INIT_HEIGHT; SENSOR_TR("\n %s..%s Format is Invalidate. pix->width = %d.. pix->height = %d\n",SENSOR_NAME_STRING(),__FUNCTION__,pix->width,pix->height); } diff --git a/drivers/media/video/gc0309.c b/drivers/media/video/gc0309.c index b1ea3f0142af..b268fe20137d 100755 --- a/drivers/media/video/gc0309.c +++ b/drivers/media/video/gc0309.c @@ -1429,7 +1429,6 @@ static int sensor_s_fmt(struct v4l2_subdev *sd, struct v4l2_format *f) winseqe_set_addr = SENSOR_INIT_WINSEQADR; /* ddl@rock-chips.com : Sensor output smallest size if isn't support app */ set_w = SENSOR_INIT_WIDTH; set_h = SENSOR_INIT_HEIGHT; - ret = -1; SENSOR_TR("\n %s..%s Format is Invalidate. pix->width = %d.. pix->height = %d\n",SENSOR_NAME_STRING(),__FUNCTION__,pix->width,pix->height); } diff --git a/drivers/media/video/gc2015.c b/drivers/media/video/gc2015.c index 21825633b90a..0a47fc97e5e3 100755 --- a/drivers/media/video/gc2015.c +++ b/drivers/media/video/gc2015.c @@ -1625,8 +1625,7 @@ static int sensor_s_fmt(struct v4l2_subdev *sd, struct v4l2_format *f) { winseqe_set_addr = SENSOR_INIT_WINSEQADR; /* ddl@rock-chips.com : Sensor output smallest size if isn't support app */ set_w = SENSOR_INIT_WIDTH; - set_h = SENSOR_INIT_HEIGHT; - ret = -1; + set_h = SENSOR_INIT_HEIGHT; SENSOR_TR("\n %s..%s Format is Invalidate. pix->width = %d.. pix->height = %d\n",SENSOR_NAME_STRING(),__FUNCTION__,pix->width,pix->height); } diff --git a/drivers/media/video/nt99250.c b/drivers/media/video/nt99250.c index 25c3e5f38fe9..6454859732d2 100755 --- a/drivers/media/video/nt99250.c +++ b/drivers/media/video/nt99250.c @@ -1788,8 +1788,7 @@ u16 AE_reg, AGC_reg; { winseqe_set_addr = SENSOR_INIT_WINSEQADR; /* ddl@rock-chips.com : Sensor output smallest size if isn't support app */ set_w = SENSOR_INIT_WIDTH; - set_h = SENSOR_INIT_HEIGHT; - ret = -1; + set_h = SENSOR_INIT_HEIGHT; SENSOR_TR("\n %s..%s Format is Invalidate. pix->width = %d.. pix->height = %d\n",SENSOR_NAME_STRING(),__FUNCTION__,pix->width,pix->height); } diff --git a/drivers/media/video/ov2655.c b/drivers/media/video/ov2655.c index 44e24fa298f8..3699deffa2c9 100755 --- a/drivers/media/video/ov2655.c +++ b/drivers/media/video/ov2655.c @@ -2017,7 +2017,6 @@ static int sensor_s_fmt(struct v4l2_subdev *sd, struct v4l2_format *f) winseqe_set_addr = SENSOR_INIT_WINSEQADR; /* ddl@rock-chips.com : Sensor output smallest size if isn't support app */ set_w = SENSOR_INIT_WIDTH; set_h = SENSOR_INIT_HEIGHT; - ret = -1; SENSOR_TR("\n %s..%s Format is Invalidate. pix->width = %d.. pix->height = %d\n",SENSOR_NAME_STRING(),__FUNCTION__,pix->width,pix->height); } diff --git a/drivers/media/video/ov2659.c b/drivers/media/video/ov2659.c index 54b6a1b9bc4c..9590695c9414 100755 --- a/drivers/media/video/ov2659.c +++ b/drivers/media/video/ov2659.c @@ -1836,7 +1836,6 @@ static int sensor_s_fmt(struct v4l2_subdev *sd, struct v4l2_format *f) winseqe_set_addr = SENSOR_INIT_WINSEQADR; /* ddl@rock-chips.com : Sensor output smallest size if isn't support app */ set_w = SENSOR_INIT_WIDTH; set_h = SENSOR_INIT_HEIGHT; - ret = -1; SENSOR_TR("\n %s..%s Format is Invalidate. pix->width = %d.. pix->height = %d\n",SENSOR_NAME_STRING(),__FUNCTION__,pix->width,pix->height); } diff --git a/drivers/media/video/ov5640.c b/drivers/media/video/ov5640.c index ad833df714ce..6ce06fa18158 100755 --- a/drivers/media/video/ov5640.c +++ b/drivers/media/video/ov5640.c @@ -2446,7 +2446,6 @@ static int sensor_s_fmt(struct v4l2_subdev *sd, struct v4l2_format *f) winseqe_set_addr = SENSOR_INIT_WINSEQADR; /* ddl@rock-chips.com : Sensor output smallest size if isn't support app */ set_w = SENSOR_INIT_WIDTH; set_h = SENSOR_INIT_HEIGHT; - ret = -1; SENSOR_TR("\n %s..%s Format is Invalidate. pix->width = %d.. pix->height = %d\n",SENSOR_NAME_STRING(),__FUNCTION__,pix->width,pix->height); } diff --git a/drivers/media/video/ov5642.c b/drivers/media/video/ov5642.c index 2691c3e6e5f6..7b4ed15b78cc 100755 --- a/drivers/media/video/ov5642.c +++ b/drivers/media/video/ov5642.c @@ -4382,7 +4382,6 @@ static int sensor_s_fmt(struct v4l2_subdev *sd, struct v4l2_format *f) winseqe_set_addr = SENSOR_INIT_WINSEQADR; /* ddl@rock-chips.com : Sensor output smallest size if isn't support app */ set_w = SENSOR_INIT_WIDTH; set_h = SENSOR_INIT_HEIGHT; - ret = -1; SENSOR_TR("\n %s..%s Format is Invalidate. pix->width = %d.. pix->height = %d\n",SENSOR_NAME_STRING(),__FUNCTION__,pix->width,pix->height); } diff --git a/drivers/media/video/ov7675.c b/drivers/media/video/ov7675.c index c9a427147d1c..0f4feace4996 100755 --- a/drivers/media/video/ov7675.c +++ b/drivers/media/video/ov7675.c @@ -1686,8 +1686,7 @@ static int sensor_s_fmt(struct v4l2_subdev *sd, struct v4l2_format *f) { winseqe_set_addr = SENSOR_INIT_WINSEQADR; /* ddl@rock-chips.com : Sensor output smallest size if isn't support app */ set_w = SENSOR_INIT_WIDTH; - set_h = SENSOR_INIT_HEIGHT; - ret = -1; + set_h = SENSOR_INIT_HEIGHT; SENSOR_TR("\n %s..%s Format is Invalidate. pix->width = %d.. pix->height = %d\n",SENSOR_NAME_STRING(),__FUNCTION__,pix->width,pix->height); } diff --git a/drivers/media/video/sid130B.c b/drivers/media/video/sid130B.c index 3bd908527014..e8dc7f8474bc 100755 --- a/drivers/media/video/sid130B.c +++ b/drivers/media/video/sid130B.c @@ -2015,8 +2015,7 @@ static int sensor_s_fmt(struct v4l2_subdev *sd, struct v4l2_format *f) { winseqe_set_addr = SENSOR_INIT_WINSEQADR; /* ddl@rock-chips.com : Sensor output smallest size if isn't support app */ set_w = SENSOR_INIT_WIDTH; - set_h = SENSOR_INIT_HEIGHT; - ret = -1; + set_h = SENSOR_INIT_HEIGHT; SENSOR_TR("\n %s..%s Format is Invalidate. pix->width = %d.. pix->height = %d\n",SENSOR_NAME_STRING(),__FUNCTION__,pix->width,pix->height); } diff --git a/drivers/media/video/siv120b.c b/drivers/media/video/siv120b.c index 0e37a009a0e9..ade9562072ac 100755 --- a/drivers/media/video/siv120b.c +++ b/drivers/media/video/siv120b.c @@ -1741,8 +1741,7 @@ static int sensor_s_fmt(struct v4l2_subdev *sd, struct v4l2_format *f) { winseqe_set_addr = SENSOR_INIT_WINSEQADR; /* ddl@rock-chips.com : Sensor output smallest size if isn't support app */ set_w = SENSOR_INIT_WIDTH; - set_h = SENSOR_INIT_HEIGHT; - ret = -1; + set_h = SENSOR_INIT_HEIGHT; SENSOR_TR("\n %s..%s Format is Invalidate. pix->width = %d.. pix->height = %d\n",SENSOR_NAME_STRING(),__FUNCTION__,pix->width,pix->height); }