[media] uvcvideo: Cleanup leftovers of partial revert

pinchartl · Mauro Carvalho Chehab · commit 29005c09f41d · 2013-01-11T13:30:14.000-02:00
Commit ba68c8530a263dc4de440fa10bb20a1c5b9d4ff5 (Partly revert "[media]
uvcvideo: Set error_idx properly for extended controls API failures")
missed two modifications. Clean them up.

Signed-off-by: Laurent Pinchart &lt;laurent.pinchart@ideasonboard.com&gt;
Acked-by: Hans Verkuil &lt;hans.verkuil@cisco.com&gt;
Signed-off-by: Mauro Carvalho Chehab &lt;mchehab@redhat.com&gt;
diff --git 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)
 			ret = uvc_ctrl_get(chain, ctrl);
 			if (ret < 0) {
 				uvc_ctrl_rollback(handle);
-				ctrls->error_idx = ret == -ENOENT
-						 ? ctrls->count : i;
+				ctrls->error_idx = i;
 				return ret;
 			}
 		}
@@ -686,9 +685,7 @@ static long uvc_v4l2_do_ioctl(struct file *file, unsigned int cmd, void *arg)
 			ret = uvc_ctrl_set(chain, ctrl);
 			if (ret < 0) {
 				uvc_ctrl_rollback(handle);
-				ctrls->error_idx = (ret == -ENOENT &&
-						    cmd == VIDIOC_S_EXT_CTRLS)
-						 ? ctrls->count : i;
+				ctrls->error_idx = i;
 				return ret;
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -657,8 +657,7 @@ static long uvc_v4l2_do_ioctl(struct file file, unsigned int cmd, void arg)`
`657`	`657`	`ret = uvc_ctrl_get(chain, ctrl);`
`658`	`658`	`if (ret < 0) {`
`659`	`659`	`uvc_ctrl_rollback(handle);`
`660`		`- ctrls->error_idx = ret == -ENOENT`
`661`		`- ? ctrls->count : i;`
	`660`	`+ ctrls->error_idx = i;`
`662`	`661`	`return ret;`
`663`	`662`	`}`
`664`	`663`	`}`
`@@ -686,9 +685,7 @@ static long uvc_v4l2_do_ioctl(struct file file, unsigned int cmd, void arg)`
`686`	`685`	`ret = uvc_ctrl_set(chain, ctrl);`
`687`	`686`	`if (ret < 0) {`
`688`	`687`	`uvc_ctrl_rollback(handle);`
`689`		`- ctrls->error_idx = (ret == -ENOENT &&`
`690`		`- cmd == VIDIOC_S_EXT_CTRLS)`
`691`		`- ? ctrls->count : i;`
	`688`	`+ ctrls->error_idx = i;`
`692`	`689`	`return ret;`
`693`	`690`	`}`
`694`	`691`	`}`