diff options
Diffstat (limited to 'drivers/media/usb/uvc/uvc_v4l2.c')
| -rw-r--r-- | drivers/media/usb/uvc/uvc_v4l2.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/media/usb/uvc/uvc_v4l2.c b/drivers/media/usb/uvc/uvc_v4l2.c index f2ee8c6b0d8d..68d59b527492 100644 --- a/drivers/media/usb/uvc/uvc_v4l2.c +++ b/drivers/media/usb/uvc/uvc_v4l2.c | |||
| @@ -657,8 +657,7 @@ static long uvc_v4l2_do_ioctl(struct file *file, unsigned int cmd, void *arg) | |||
| 657 | ret = uvc_ctrl_get(chain, ctrl); | 657 | ret = uvc_ctrl_get(chain, ctrl); |
| 658 | if (ret < 0) { | 658 | if (ret < 0) { |
| 659 | uvc_ctrl_rollback(handle); | 659 | uvc_ctrl_rollback(handle); |
| 660 | ctrls->error_idx = ret == -ENOENT | 660 | ctrls->error_idx = i; |
| 661 | ? ctrls->count : i; | ||
| 662 | return ret; | 661 | return ret; |
| 663 | } | 662 | } |
| 664 | } | 663 | } |
| @@ -686,8 +685,7 @@ static long uvc_v4l2_do_ioctl(struct file *file, unsigned int cmd, void *arg) | |||
| 686 | ret = uvc_ctrl_set(chain, ctrl); | 685 | ret = uvc_ctrl_set(chain, ctrl); |
| 687 | if (ret < 0) { | 686 | if (ret < 0) { |
| 688 | uvc_ctrl_rollback(handle); | 687 | uvc_ctrl_rollback(handle); |
| 689 | ctrls->error_idx = (ret == -ENOENT && | 688 | ctrls->error_idx = cmd == VIDIOC_S_EXT_CTRLS |
| 690 | cmd == VIDIOC_S_EXT_CTRLS) | ||
| 691 | ? ctrls->count : i; | 689 | ? ctrls->count : i; |
| 692 | return ret; | 690 | return ret; |
| 693 | } | 691 | } |