projects / firefly-linux-kernel-4.4.55.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 3841893)
camera: fix sensor default resolution return error when user resolution isn't catch
authorddl <ddl@rockchip.com>
Wed, 4 May 2011 07:58:40 +0000 (15:58 +0800)
committerddl <ddl@rockchip.com>
Wed, 4 May 2011 07:58:40 +0000 (15:58 +0800)
drivers/media/video/gc0308.c patch | blob | history
drivers/media/video/gc0309.c patch | blob | history
drivers/media/video/gc2015.c patch | blob | history
drivers/media/video/nt99250.c patch | blob | history
drivers/media/video/ov2655.c patch | blob | history
drivers/media/video/ov2659.c patch | blob | history
drivers/media/video/ov5640.c patch | blob | history
drivers/media/video/ov5642.c patch | blob | history
drivers/media/video/ov7675.c patch | blob | history
drivers/media/video/sid130B.c patch | blob | history
drivers/media/video/siv120b.c patch | blob | history

diff --git a/drivers/media/video/gc0308.c b/drivers/media/video/gc0308.c
index c2db1478d1110684e1213eb2996cef963cbf8238..a2d345978b3c6c83e9e27a01dc1534a96df19047 100755 (executable)
--- 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 b1ea3f0142af212925e58b5fea88634df714978a..b268fe20137d3595a29109b75f8b724d114e2972 100755 (executable)
--- 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 21825633b90a68985e813ab6d4ad64bf3a5700dc..0a47fc97e5e39a4fa3ecff5c8955de9beb7f200b 100755 (executable)
--- 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 25c3e5f38fe9c8106dc10504f6baf71248ec76a4..6454859732d2f7d8496e166172f5a52e37963370 100755 (executable)
--- 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 44e24fa298f8a5ca133de0274f046d695fecaea4..3699deffa2c9960540b8523fbb7d3550d493047e 100755 (executable)
--- 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 54b6a1b9bc4c7c0106fba95c4ede32b19d50374f..9590695c9414dcd2bda56c1b3b3fce2fa9288522 100755 (executable)
--- 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 ad833df714ceb462696283d93e36de41c59012ed..6ce06fa181583d6610e19fee107abc0d929051b5 100755 (executable)
--- 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 2691c3e6e5f668294faafbc974da9a8b7c60a3a8..7b4ed15b78cc55370ca839925627a579fd007023 100755 (executable)
--- 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 c9a427147d1ca0582a7286ad3116b19ad51ce7f5..0f4feace4996f88264d09f1d37710d02a1c825c4 100755 (executable)
--- 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 3bd9085270145abc5240bad87f023b7a0e5540bb..e8dc7f8474bcfc9bab45857e6baf3efee66c848f 100755 (executable)
--- 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)
     {\r
         winseqe_set_addr = SENSOR_INIT_WINSEQADR;               /* ddl@rock-chips.com : Sensor output smallest size if  isn't support app  */\r
         set_w = SENSOR_INIT_WIDTH;\r
-        set_h = SENSOR_INIT_HEIGHT;\r
-               ret = -1;\r
+        set_h = SENSOR_INIT_HEIGHT;            \r
                SENSOR_TR("\n %s..%s Format is Invalidate. pix->width = %d.. pix->height = %d\n",SENSOR_NAME_STRING(),__FUNCTION__,pix->width,pix->height);\r
     }\r
 \r
diff --git a/drivers/media/video/siv120b.c b/drivers/media/video/siv120b.c
index 0e37a009a0e9aeb2795028c6625966e2bdf64425..ade9562072ac79684cf19747c9e8bbda8b0f2570 100755 (executable)
--- 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);
     }
 
Unnamed repository; edit this file 'description' to name the repository.