+5

drivers/media/common/videobuf2/videobuf2-v4l2.c

reviewed

··· 1010 1010 if (vb2_queue_is_busy(vdev->queue, file)) 1011 1011 return -EBUSY; 1012 1012 1013 1013 + if (vb2_fileio_is_active(vdev->queue)) { 1014 1014 + dprintk(vdev->queue, 1, "file io in progress\n"); 1015 1015 + return -EBUSY; 1016 1016 + } 1017 1017 + 1013 1018 return vb2_core_remove_bufs(vdev->queue, d->index, d->count); 1014 1019 } 1015 1020 EXPORT_SYMBOL_GPL(vb2_ioctl_remove_bufs);

+3 -6

drivers/media/pci/cx18/cx18-driver.c

reviewed

··· 1136 1136 int video_input; 1137 1137 int fw_retry_count = 3; 1138 1138 struct v4l2_frequency vf; 1139 1139 - struct cx18_open_id fh; 1140 1139 v4l2_std_id std; 1141 1141 - 1142 1142 - fh.cx = cx; 1143 1140 1144 1141 if (test_bit(CX18_F_I_FAILED, &cx->i_flags)) 1145 1142 return -ENXIO; ··· 1217 1220 1218 1221 video_input = cx->active_input; 1219 1222 cx->active_input++; /* Force update of input */ 1220 1220 - cx18_s_input(NULL, &fh, video_input); 1223 1223 + cx18_do_s_input(cx, video_input); 1221 1224 1222 1225 /* Let the VIDIOC_S_STD ioctl do all the work, keeps the code 1223 1226 in one place. */ 1224 1227 cx->std++; /* Force full standard initialization */ 1225 1228 std = (cx->tuner_std == V4L2_STD_ALL) ? V4L2_STD_NTSC_M : cx->tuner_std; 1226 1226 - cx18_s_std(NULL, &fh, std); 1227 1227 - cx18_s_frequency(NULL, &fh, &vf); 1229 1229 + cx18_do_s_std(cx, std); 1230 1230 + cx18_do_s_frequency(cx, &vf); 1228 1231 return 0; 1229 1232 } 1230 1233

+19 -11

drivers/media/pci/cx18/cx18-ioctl.c

reviewed

··· 521 521 return 0; 522 522 } 523 523 524 524 - int cx18_s_input(struct file *file, void *fh, unsigned int inp) 524 524 + int cx18_do_s_input(struct cx18 *cx, unsigned int inp) 525 525 { 526 526 - struct cx18_open_id *id = file2id(file); 527 527 - struct cx18 *cx = id->cx; 528 526 v4l2_std_id std = V4L2_STD_ALL; 529 527 const struct cx18_card_video_input *card_input = 530 528 cx->card->video_inputs + inp; ··· 556 558 return 0; 557 559 } 558 560 561 561 + static int cx18_s_input(struct file *file, void *fh, unsigned int inp) 562 562 + { 563 563 + return cx18_do_s_input(file2id(file)->cx, inp); 564 564 + } 565 565 + 559 566 static int cx18_g_frequency(struct file *file, void *fh, 560 567 struct v4l2_frequency *vf) 561 568 { ··· 573 570 return 0; 574 571 } 575 572 576 576 - int cx18_s_frequency(struct file *file, void *fh, const struct v4l2_frequency *vf) 573 573 + int cx18_do_s_frequency(struct cx18 *cx, const struct v4l2_frequency *vf) 577 574 { 578 578 - struct cx18_open_id *id = file2id(file); 579 579 - struct cx18 *cx = id->cx; 580 580 - 581 575 if (vf->tuner != 0) 582 576 return -EINVAL; 583 577 ··· 585 585 return 0; 586 586 } 587 587 588 588 + static int cx18_s_frequency(struct file *file, void *fh, 589 589 + const struct v4l2_frequency *vf) 590 590 + { 591 591 + return cx18_do_s_frequency(file2id(file)->cx, vf); 592 592 + } 593 593 + 588 594 static int cx18_g_std(struct file *file, void *fh, v4l2_std_id *std) 589 595 { 590 596 struct cx18 *cx = file2id(file)->cx; ··· 599 593 return 0; 600 594 } 601 595 602 602 - int cx18_s_std(struct file *file, void *fh, v4l2_std_id std) 596 596 + int cx18_do_s_std(struct cx18 *cx, v4l2_std_id std) 603 597 { 604 604 - struct cx18_open_id *id = file2id(file); 605 605 - struct cx18 *cx = id->cx; 606 606 - 607 598 if ((std & V4L2_STD_ALL) == 0) 608 599 return -EINVAL; 609 600 ··· 643 640 /* Tuner */ 644 641 cx18_call_all(cx, video, s_std, cx->std); 645 642 return 0; 643 643 + } 644 644 + 645 645 + static int cx18_s_std(struct file *file, void *fh, v4l2_std_id std) 646 646 + { 647 647 + return cx18_do_s_std(file2id(file)->cx, std); 646 648 } 647 649 648 650 static int cx18_s_tuner(struct file *file, void *fh, const struct v4l2_tuner *vt)

+5 -3

drivers/media/pci/cx18/cx18-ioctl.h

reviewed

··· 12 12 void cx18_expand_service_set(struct v4l2_sliced_vbi_format *fmt, int is_pal); 13 13 u16 cx18_get_service_set(struct v4l2_sliced_vbi_format *fmt); 14 14 void cx18_set_funcs(struct video_device *vdev); 15 15 - int cx18_s_std(struct file *file, void *fh, v4l2_std_id std); 16 16 - int cx18_s_frequency(struct file *file, void *fh, const struct v4l2_frequency *vf); 17 17 - int cx18_s_input(struct file *file, void *fh, unsigned int inp); 15 15 + 16 16 + struct cx18; 17 17 + int cx18_do_s_std(struct cx18 *cx, v4l2_std_id std); 18 18 + int cx18_do_s_frequency(struct cx18 *cx, const struct v4l2_frequency *vf); 19 19 + int cx18_do_s_input(struct cx18 *cx, unsigned int inp);

+4 -7

drivers/media/pci/ivtv/ivtv-driver.c

reviewed

··· 1247 1247 1248 1248 int ivtv_init_on_first_open(struct ivtv *itv) 1249 1249 { 1250 1250 - struct v4l2_frequency vf; 1251 1250 /* Needed to call ioctls later */ 1252 1252 - struct ivtv_open_id fh; 1251 1251 + struct ivtv_stream *s = &itv->streams[IVTV_ENC_STREAM_TYPE_MPG]; 1252 1252 + struct v4l2_frequency vf; 1253 1253 int fw_retry_count = 3; 1254 1254 int video_input; 1255 1255 - 1256 1256 - fh.itv = itv; 1257 1257 - fh.type = IVTV_ENC_STREAM_TYPE_MPG; 1258 1255 1259 1256 if (test_bit(IVTV_F_I_FAILED, &itv->i_flags)) 1260 1257 return -ENXIO; ··· 1294 1297 1295 1298 video_input = itv->active_input; 1296 1299 itv->active_input++; /* Force update of input */ 1297 1297 - ivtv_s_input(NULL, &fh, video_input); 1300 1300 + ivtv_do_s_input(itv, video_input); 1298 1301 1299 1302 /* Let the VIDIOC_S_STD ioctl do all the work, keeps the code 1300 1303 in one place. */ 1301 1304 itv->std++; /* Force full standard initialization */ 1302 1305 itv->std_out = itv->std; 1303 1303 - ivtv_s_frequency(NULL, &fh, &vf); 1306 1306 + ivtv_do_s_frequency(s, &vf); 1304 1307 1305 1308 if (itv->card->v4l2_capabilities & V4L2_CAP_VIDEO_OUTPUT) { 1306 1309 /* Turn on the TV-out: ivtv_init_mpeg_decoder() initializes

+17 -5

drivers/media/pci/ivtv/ivtv-ioctl.c

reviewed

··· 974 974 return 0; 975 975 } 976 976 977 977 - int ivtv_s_input(struct file *file, void *fh, unsigned int inp) 977 977 + int ivtv_do_s_input(struct ivtv *itv, unsigned int inp) 978 978 { 979 979 - struct ivtv *itv = file2id(file)->itv; 980 979 v4l2_std_id std; 981 980 int i; 982 981 ··· 1014 1015 ivtv_unmute(itv); 1015 1016 1016 1017 return 0; 1018 1018 + } 1019 1019 + 1020 1020 + static int ivtv_s_input(struct file *file, void *fh, unsigned int inp) 1021 1021 + { 1022 1022 + return ivtv_do_s_input(file2id(file)->itv, inp); 1017 1023 } 1018 1024 1019 1025 static int ivtv_g_output(struct file *file, void *fh, unsigned int *i) ··· 1069 1065 return 0; 1070 1066 } 1071 1067 1072 1072 - int ivtv_s_frequency(struct file *file, void *fh, const struct v4l2_frequency *vf) 1068 1068 + int ivtv_do_s_frequency(struct ivtv_stream *s, const struct v4l2_frequency *vf) 1073 1069 { 1074 1074 - struct ivtv *itv = file2id(file)->itv; 1075 1075 - struct ivtv_stream *s = &itv->streams[file2id(file)->type]; 1070 1070 + struct ivtv *itv = s->itv; 1076 1071 1077 1072 if (s->vdev.vfl_dir) 1078 1073 return -ENOTTY; ··· 1083 1080 ivtv_call_all(itv, tuner, s_frequency, vf); 1084 1081 ivtv_unmute(itv); 1085 1082 return 0; 1083 1083 + } 1084 1084 + 1085 1085 + static int ivtv_s_frequency(struct file *file, void *fh, 1086 1086 + const struct v4l2_frequency *vf) 1087 1087 + { 1088 1088 + struct ivtv_open_id *id = file2id(file); 1089 1089 + struct ivtv *itv = id->itv; 1090 1090 + 1091 1091 + return ivtv_do_s_frequency(&itv->streams[id->type], vf); 1086 1092 } 1087 1093 1088 1094 static int ivtv_g_std(struct file *file, void *fh, v4l2_std_id *std)

+4 -2

drivers/media/pci/ivtv/ivtv-ioctl.h

reviewed

··· 9 9 #ifndef IVTV_IOCTL_H 10 10 #define IVTV_IOCTL_H 11 11 12 12 + struct ivtv; 13 13 + 12 14 u16 ivtv_service2vbi(int type); 13 15 void ivtv_expand_service_set(struct v4l2_sliced_vbi_format *fmt, int is_pal); 14 16 u16 ivtv_get_service_set(struct v4l2_sliced_vbi_format *fmt); ··· 19 17 void ivtv_set_funcs(struct video_device *vdev); 20 18 void ivtv_s_std_enc(struct ivtv *itv, v4l2_std_id std); 21 19 void ivtv_s_std_dec(struct ivtv *itv, v4l2_std_id std); 22 22 - int ivtv_s_frequency(struct file *file, void *fh, const struct v4l2_frequency *vf); 23 23 - int ivtv_s_input(struct file *file, void *fh, unsigned int inp); 20 20 + int ivtv_do_s_frequency(struct ivtv_stream *s, const struct v4l2_frequency *vf); 21 21 + int ivtv_do_s_input(struct ivtv *itv, unsigned int inp); 24 22 25 23 #endif

+14 -1

drivers/media/usb/uvc/uvc_driver.c

reviewed

··· 167 167 168 168 static struct uvc_streaming *uvc_stream_by_id(struct uvc_device *dev, int id) 169 169 { 170 170 - struct uvc_streaming *stream; 170 170 + struct uvc_streaming *stream, *last_stream; 171 171 + unsigned int count = 0; 171 172 172 173 list_for_each_entry(stream, &dev->streams, list) { 174 174 + count += 1; 175 175 + last_stream = stream; 173 176 if (stream->header.bTerminalLink == id) 174 177 return stream; 178 178 + } 179 179 + 180 180 + /* 181 181 + * If the streaming entity is referenced by an invalid ID, notify the 182 182 + * user and use heuristics to guess the correct entity. 183 183 + */ 184 184 + if (count == 1 && id == UVC_INVALID_ENTITY_ID) { 185 185 + dev_warn(&dev->intf->dev, 186 186 + "UVC non compliance: Invalid USB header. The streaming entity has an invalid ID, guessing the correct one."); 187 187 + return last_stream; 175 188 } 176 189 177 190 return NULL;

+1 -1

drivers/media/v4l2-core/v4l2-subdev.c

reviewed

··· 2608 2608 int v4l2_subdev_get_privacy_led(struct v4l2_subdev *sd) 2609 2609 { 2610 2610 #if IS_REACHABLE(CONFIG_LEDS_CLASS) 2611 2611 - sd->privacy_led = led_get(sd->dev, "privacy-led"); 2611 2611 + sd->privacy_led = led_get(sd->dev, "privacy"); 2612 2612 if (IS_ERR(sd->privacy_led) && PTR_ERR(sd->privacy_led) != -ENOENT) 2613 2613 return dev_err_probe(sd->dev, PTR_ERR(sd->privacy_led), 2614 2614 "getting privacy LED\n");

+1 -1

drivers/platform/x86/intel/int3472/led.c

reviewed

··· 43 43 44 44 int3472->pled.lookup.provider = int3472->pled.name; 45 45 int3472->pled.lookup.dev_id = int3472->sensor_name; 46 46 - int3472->pled.lookup.con_id = "privacy-led"; 46 46 + int3472->pled.lookup.con_id = "privacy"; 47 47 led_add_lookup(&int3472->pled.lookup); 48 48 49 49 return 0;