hc
2023-12-11 d2ccde1c8e90d38cee87a1b0309ad2827f3fd30d
kernel/drivers/media/i2c/ov2775.c
....@@ -94,14 +94,6 @@
9494
9595 #define OV2775_NAME "ov2775"
9696
97
-enum ov2775_max_pad {
98
- PAD0, /* link to isp */
99
- PAD1, /* link to csi wr0 | hdr x2:L x3:M */
100
- PAD2, /* link to csi wr1 | hdr x3:L */
101
- PAD3, /* link to csi wr2 | hdr x2:M x3:S */
102
- PAD_MAX,
103
-};
104
-
10597 struct ov2775_gpio {
10698 int pltfrm_gpio;
10799 const char *label;
....@@ -4111,9 +4103,7 @@
41114103 struct ov2775 *ov2775 = to_ov2775(sd);
41124104 const struct ov2775_mode *mode = ov2775->cur_mode;
41134105
4114
- mutex_lock(&ov2775->mutex);
41154106 fi->interval = mode->max_fps;
4116
- mutex_unlock(&ov2775->mutex);
41174107
41184108 return 0;
41194109 }
....@@ -4873,7 +4863,7 @@
48734863 switch (ctrl->id) {
48744864 case V4L2_CID_EXPOSURE:
48754865 if (ov2775->cur_mode->hdr_mode != NO_HDR)
4876
- return 0;
4866
+ goto ctrl_end;
48774867 ret = ov2775_write_reg(ov2775->client,
48784868 OV2775_REG_EXPOSURE_H,
48794869 OV2775_REG_VALUE_08BIT,
....@@ -4888,7 +4878,7 @@
48884878 break;
48894879 case V4L2_CID_ANALOGUE_GAIN:
48904880 if (ov2775->cur_mode->hdr_mode != NO_HDR)
4891
- return 0;
4881
+ goto ctrl_end;
48924882 ov2775_get_linear_reg(ctrl->val, &gain_a, &gain_d);
48934883 ret = ov2775_write_reg(ov2775->client,
48944884 OV2775_REG_GAIN,
....@@ -4945,6 +4935,7 @@
49454935 break;
49464936 }
49474937
4938
+ctrl_end:
49484939 pm_runtime_put(&client->dev);
49494940
49504941 return ret;