V4L/DVB (13506): uvcvideo: Factorize common field in uvc_entity structure

The bNrInPins and baSourceID fields are common among all entities (some
of use bSourceID but this is conceptually the same). Move those two
fields out of entity type-specific unions into the uvc_entity structure
top level.

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

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/media/video/uvc/uvc_v4l2.c b/drivers/media/video/uvc/uvc_v4l2.c
index 9e1f2c208ed8..23239a4adefe 100644
--- a/drivers/media/video/uvc/uvc_v4l2.c
+++ b/drivers/media/video/uvc/uvc_v4l2.c
@@ -625,8 +625,8 @@ static long uvc_v4l2_do_ioctl(struct file *file, unsigned int cmd, void *arg)
                                         break;
                         }
                         pin = iterm->id;
-                } else if (pin < selector->selector.bNrInPins) {
-                        pin = selector->selector.baSourceID[index];
+                } else if (pin < selector->bNrInPins) {
+                        pin = selector->baSourceID[index];
                         list_for_each_entry(iterm, &chain->entities, chain) {
                                 if (!UVC_ENTITY_IS_ITERM(iterm))
                                         continue;
@@ -680,7 +680,7 @@ static long uvc_v4l2_do_ioctl(struct file *file, unsigned int cmd, void *arg)
                         break;
                 }
 
-                if (input == 0 || input > chain->selector->selector.bNrInPins)
+                if (input == 0 || input > chain->selector->bNrInPins)
                         return -EINVAL;
 
                 return uvc_query_ctrl(chain->dev, UVC_SET_CUR,