diff options
| author | Hans Verkuil <hverkuil-cisco@xs4all.nl> | 2021-06-02 10:42:28 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab+huawei@kernel.org> | 2021-06-02 11:41:54 +0200 |
| commit | 1cb13613735a15b994b680ae5ef18aaf79108b95 (patch) | |
| tree | 067ccf5cfdcaba6a8aea0b6b20476f84b8eefdce | |
| parent | b998a59f82f1152605eae4f7617778020549e81a (diff) | |
| download | linux-1cb13613735a15b994b680ae5ef18aaf79108b95.tar.bz2 | |
media: mc-request.c: allow object_bind in QUEUED state
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 <hverkuil-cisco@xs4all.nl>
Fixes: c3bf5129f339 ("media: v4l2-ctrls: always copy the controls on completion")
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
| -rw-r--r-- | drivers/media/mc/mc-request.c | 3 |
1 files changed, 2 insertions, 1 deletions
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; |