V4L/DVB (13503): uvcvideo: Merge iterms, oterms and units linked lists

All terminals and units are now added to a single linked list of
entities per chain. This makes terminals and units handling code more
generic.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 7 insertions, 3 deletions

diff --git a/drivers/media/video/uvc/uvc_v4l2.c b/drivers/media/video/uvc/uvc_v4l2.c
index be3da56d4db3..9e1f2c208ed8 100644
--- a/drivers/media/video/uvc/uvc_v4l2.c
+++ b/drivers/media/video/uvc/uvc_v4l2.c
@@ -620,12 +620,16 @@ static long uvc_v4l2_do_ioctl(struct file *file, unsigned int cmd, void *arg)
                     (chain->dev->quirks & UVC_QUIRK_IGNORE_SELECTOR_UNIT)) {
                         if (index != 0)
                                 return -EINVAL;
-                        iterm = list_first_entry(&chain->iterms,
-                                        struct uvc_entity, chain);
+                        list_for_each_entry(iterm, &chain->entities, chain) {
+                                if (UVC_ENTITY_IS_ITERM(iterm))
+                                        break;
+                        }
                         pin = iterm->id;
                 } else if (pin < selector->selector.bNrInPins) {
                         pin = selector->selector.baSourceID[index];
-                        list_for_each_entry(iterm, chain->iterms.next, chain) {
+                        list_for_each_entry(iterm, &chain->entities, chain) {
+                                if (!UVC_ENTITY_IS_ITERM(iterm))
+                                        continue;
                                 if (iterm->id == pin)
                                         break;
                         }