Skip to contentSkip to conversation

media: uvcvideo:Create input device for all uvc devices with status endpoints.

PATCH In review chenchangcheng 2 participants 2 messages Nov 4, 2024

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 media: uvcvideo:Create input device for all uvc devices with status endpoints.

Some applications need to check if there is an input device on the camera before proceeding to the next step. When there is no input device, the application will report an error.
Create input device for all uvc devices with status endpoints. and only when bTriggerSupport and bTriggerUsage are one are allowed to report camera button.

Fixes 3bc22dc66a4f (media: uvcvideo: Only create input devs if hw supports it)
---
 drivers/media/usb/uvc/uvc_status.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)
drivers/media/usb/uvc/uvc_status.c +6 -7
index a78a88c710e2..177640c6a813 100644
@@ -44,9 +44,6 @@ static int uvc_input_init(struct uvc_device *dev)
 	struct input_dev *input;
 	int ret;
 
-	if (!uvc_input_has_button(dev))
-		return 0;
-
 	input = input_allocate_device();
 	if (input == NULL)
 		return -ENOMEM;
@@ -110,10 +107,12 @@ static void uvc_event_streaming(struct uvc_device *dev,
 		if (len <= offsetof(struct uvc_status, streaming))
 			return;
 
-		uvc_dbg(dev, STATUS, "Button (intf %u) %s len %d\n",
-			status->bOriginator,
-			status->streaming.button ? "pressed" : "released", len);
-		uvc_input_report_key(dev, KEY_CAMERA, status->streaming.button);
+		if (uvc_input_has_button(dev)) {
+			uvc_dbg(dev, STATUS, "Button (intf %u) %s len %d\n",
+				status->bOriginator,
+				status->streaming.button ? "pressed" : "released", len);
+			uvc_input_report_key(dev, KEY_CAMERA, status->streaming.button);
+		}
 	} else {
 		uvc_dbg(dev, STATUS, "Stream %u error event %02x len %d\n",
 			status->bOriginator, status->bEvent, len);
Signature · 1 line
2.25.1
#1 lore raw

Hi

Quoted 4 lines · chenchangcheng

Some applications need to check if there is an input device on the camera before proceeding to the next step. When there is no input device, the application will report an error.

Out of curiosity, what app are you having issues with?

Quoted 25 lines

Create input device for all uvc devices with status endpoints. and only when bTriggerSupport and bTriggerUsage are one are allowed to report camera button.

Fixes 3bc22dc66a4f (media: uvcvideo: Only create input devs if hw supports it)
---
 drivers/media/usb/uvc/uvc_status.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)
drivers/media/usb/uvc/uvc_status.c +0 -3
index a78a88c710e2..177640c6a813 100644
@@ -44,9 +44,6 @@ static int uvc_input_init(struct uvc_device *dev)
        struct input_dev *input;
        int ret;
 
-       if (!uvc_input_has_button(dev))
-               return 0;
-
        input = input_allocate_device();
        if (input == NULL)
                return -ENOMEM;

drivers/media/usb/uvc/uvc_status.c static void uvc_event_streaming(struct uvc_device *dev, · line 110

Quoted 8 lines
drivers/media/usb/uvc/uvc_status.c +1 -4
@@ -110,10 +107,12 @@ static void uvc_event_streaming(struct uvc_device *dev,
                if (len <= offsetof(struct uvc_status, streaming))
                        return;
 
-               uvc_dbg(dev, STATUS, "Button (intf %u) %s len %d\n",
-                       status->bOriginator,
-                       status->streaming.button ? "pressed" : "released", len);
-               uvc_input_report_key(dev, KEY_CAMERA, status->streaming.button);
+               if (uvc_input_has_button(dev)) {

If there is no button, do you ever reach this point of the code?

Quoted 12 lines
drivers/media/usb/uvc/uvc_status.c +5 -1
+                       uvc_dbg(dev, STATUS, "Button (intf %u) %s len %d\n",
+                               status->bOriginator,
+                               status->streaming.button ? "pressed" : "released", len);
+                       uvc_input_report_key(dev, KEY_CAMERA, status->streaming.button);
+               }
        } else {
                uvc_dbg(dev, STATUS, "Stream %u error event %02x len %d\n",
                        status->bOriginator, status->bEvent, len);
--

2.25.1

Signature · 1 line
Ricardo Ribalda