ARM64: DTS: Add rk3399-firefly uart4 device, node as /dev/ttyS1

[firefly-linux-kernel-4.4.55.git] / drivers / media / video / ov3660.c

diff --git a/drivers/media/video/ov3660.c b/drivers/media/video/ov3660.c
index 26845554162d9c7204c7cd9189acd12b68ee6bc3..efee33bdcc214ce66c6b4abd9cad55a15f696e7f 100755 (executable)
--- a/drivers/media/video/ov3660.c
+++ b/drivers/media/video/ov3660.c
@@ -1388,7 +1388,7 @@ static struct reginfo sensor_Zoom3[] =
 static struct reginfo *sensor_ZoomSeqe[] = {sensor_Zoom0, sensor_Zoom1, sensor_Zoom2, sensor_Zoom3, NULL,};\r
 #endif\r
 \r
-#if CONFIG_SENSOR_ISO\r
+#if 0\r
 static struct reginfo sensor_ISO100[] =\r
 {\r
 \r
@@ -1416,7 +1416,7 @@ static struct reginfo sensor_ISO800[] =
 static struct reginfo *sensor_ISOSeqe[] = {sensor_ISO100, sensor_ISO200, sensor_ISO400, sensor_ISO800, NULL,};\r
 #endif\r
 \r
-static const struct v4l2_querymenu sensor_menus[] =\r
+static struct v4l2_querymenu sensor_menus[] =\r
 {\r
        #if CONFIG_SENSOR_WhiteBalance\r
     { .id = V4L2_CID_DO_WHITE_BALANCE,  .index = 0,  .name = "auto",  .reserved = 0, }, {  .id = V4L2_CID_DO_WHITE_BALANCE,  .index = 1, .name = "incandescent",  .reserved = 0,},\r
@@ -1946,7 +1946,7 @@ static int sensor_init(struct v4l2_subdev *sd, u32 val)
        const struct v4l2_queryctrl *qctrl;\r
        const struct sensor_datafmt *fmt;\r
 unsigned char value;\r
-int ret,pid = 0;\r
+int ret=0,pid = 0;\r
 \r
     SENSOR_DG("\n%s..%s.. \n",SENSOR_NAME_STRING(),__FUNCTION__);\r
 \r