hc
2023-12-11 d2ccde1c8e90d38cee87a1b0309ad2827f3fd30d
kernel/drivers/media/i2c/gc0312.c
....@@ -140,7 +140,7 @@
140140 {0x0f, 0x02},
141141 {0x10, 0x88},
142142 {0x16, 0x00},
143
- {0x17, 0x10},
143
+ {0x17, 0x17},
144144 {0x18, 0x1a},
145145 {0x19, 0x14},
146146 {0x1b, 0x48},
....@@ -790,11 +790,8 @@
790790 }
791791
792792 ret = gc0312_ioctl(sd, cmd, inf);
793
- if (!ret) {
793
+ if (!ret)
794794 ret = copy_to_user(up, inf, sizeof(*inf));
795
- if (ret)
796
- ret = -EFAULT;
797
- }
798795 kfree(inf);
799796 break;
800797 case RKMODULE_AWB_CFG:
....@@ -807,16 +804,12 @@
807804 ret = copy_from_user(cfg, up, sizeof(*cfg));
808805 if (!ret)
809806 ret = gc0312_ioctl(sd, cmd, cfg);
810
- else
811
- ret = -EFAULT;
812807 kfree(cfg);
813808 break;
814809 case RKMODULE_SET_QUICK_STREAM:
815810 ret = copy_from_user(&stream, up, sizeof(u32));
816811 if (!ret)
817812 ret = gc0312_ioctl(sd, cmd, &stream);
818
- else
819
- ret = -EFAULT;
820813 break;
821814 default:
822815 ret = -ENOIOCTLCMD;
....@@ -934,9 +927,7 @@
934927 if (fie->index >= ARRAY_SIZE(gc0312_framesizes))
935928 return -EINVAL;
936929
937
- if (fie->code != MEDIA_BUS_FMT_YUYV8_2X8)
938
- return -EINVAL;
939
-
930
+ fie->code = MEDIA_BUS_FMT_YUYV8_2X8;
940931 fie->width = gc0312_framesizes[fie->index].width;
941932 fie->height = gc0312_framesizes[fie->index].height;
942933 fie->interval = gc0312_framesizes[fie->index].max_fps;