aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil-cisco@xs4all.nl>2022-10-03 11:25:20 +0200
committerHans Verkuil <hverkuil-cisco@xs4all.nl>2022-10-03 11:25:20 +0200
commit4ed18d5ad8d9686183afe89ee29be3ee399c379f (patch)
treeea7a2dcaddadc41fd4620fccdda033aa2835abcd
parent29bf6b404c12d2fff3d379859493afe6d6810f3b (diff)
extron: fixesextron
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
-rw-r--r--drivers/media/cec/usb/extron-da-hd-4k-plus/extron-da-hd-4k-plus.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/media/cec/usb/extron-da-hd-4k-plus/extron-da-hd-4k-plus.c b/drivers/media/cec/usb/extron-da-hd-4k-plus/extron-da-hd-4k-plus.c
index d438b91e3518..263165068544 100644
--- a/drivers/media/cec/usb/extron-da-hd-4k-plus/extron-da-hd-4k-plus.c
+++ b/drivers/media/cec/usb/extron-da-hd-4k-plus/extron-da-hd-4k-plus.c
@@ -1087,8 +1087,6 @@ static int extron_querycap(struct file *file, void *priv,
strscpy(cap->card, cap->driver, sizeof(cap->card));
snprintf(cap->bus_info, sizeof(cap->bus_info),
"serio:%s", port->name);
- cap->device_caps = V4L2_CAP_EDID;
- cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS;
return 0;
}
@@ -1331,7 +1329,7 @@ static int extron_setup(struct extron *extron)
dev_info(extron->dev, "Always keep input HPD high\n");
} else {
dev_info(extron->dev, "Pull input HPD low if all output HPDs are low\n");
- extron_send_and_wait(extron, NULL, "W1ihpd", "HplgI");
+ extron_send_and_wait(extron, NULL, "W1ihpd", "Ihpd1");
}
for (p = 0; p < extron->num_ports; p++) {
@@ -1367,6 +1365,7 @@ static int extron_setup(struct extron *extron)
port->vdev.lock = &port->video_lock;
port->vdev.v4l2_dev = &extron->v4l2_dev;
port->vdev.ctrl_handler = &port->hdl;
+ port->vdev.device_caps = V4L2_CAP_EDID;
video_set_drvdata(&port->vdev, port);
v4l2_ctrl_handler_init(&port->hdl, 2);
@@ -1551,10 +1550,10 @@ loop:
*/
if (hpd_never_low) {
dev_info(extron->dev, "Always keep input HPD high\n");
- extron_send_and_wait(extron, NULL, "W0ihpd", "HplgI");
+ extron_send_and_wait(extron, NULL, "W0ihpd", "Ihpd0");
} else {
dev_info(extron->dev, "Pull input HPD low if all output HPDs are low\n");
- extron_send_and_wait(extron, NULL, "W1ihpd", "HplgI");
+ extron_send_and_wait(extron, NULL, "W1ihpd", "Ihpd1");
}
extron->hpd_never_low = hpd_never_low;
}

Privacy Policy