This is an automatic generated email to let you know that the following patch 
were queued:

Subject: media: mc-request.c: allow object_bind in QUEUED state
Author:  Hans Verkuil <[email protected]>
Date:    Wed Jun 2 10:42:28 2021 +0200

If a request was queued without a control handler object, and
a control handler object is then created and bound to the request
when copying controls on request completion, then a WARN_ON in
mc-request.c is triggered since at that time the request is in
state QUEUED, and not UPDATING.

But this is too strict, and in this case it must also allow
binding objects when in state QUEUED.

This patch was unfortunately lost when the "always copy the controls
on completion" patch was posted, it should have been part of that
commit.

Signed-off-by: Hans Verkuil <[email protected]>
Fixes: c3bf5129f339 ("media: v4l2-ctrls: always copy the controls on 
completion")
Signed-off-by: Mauro Carvalho Chehab <[email protected]>

 drivers/media/mc/mc-request.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

---

diff --git a/drivers/media/mc/mc-request.c b/drivers/media/mc/mc-request.c
index c0782fd96c59..addb8f2d8939 100644
--- a/drivers/media/mc/mc-request.c
+++ b/drivers/media/mc/mc-request.c
@@ -414,7 +414,8 @@ int media_request_object_bind(struct media_request *req,
 
        spin_lock_irqsave(&req->lock, flags);
 
-       if (WARN_ON(req->state != MEDIA_REQUEST_STATE_UPDATING))
+       if (WARN_ON(req->state != MEDIA_REQUEST_STATE_UPDATING &&
+                   req->state != MEDIA_REQUEST_STATE_QUEUED))
                goto unlock;
 
        obj->req = req;

_______________________________________________
linuxtv-commits mailing list
[email protected]
https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits

Reply via email to