git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'selinux-pr-20210629' of git://git.kernel.org/pub/scm/linux/kernel/git...
[sfrench/cifs-2.6.git]
/
drivers
/
media
/
mc
/
mc-request.c
diff --git
a/drivers/media/mc/mc-request.c
b/drivers/media/mc/mc-request.c
index c0782fd96c59162d679bda78415b40f2b65f822f..addb8f2d8939ef0a8adff5e0d8d1ab878f5f2552 100644
(file)
--- 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;