diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-12-03 11:29:20 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-12-03 11:29:20 -0800 |
| commit | 0072a0c14d5b7cb72c611d396f143f5dcd73ebe2 (patch) | |
| tree | 12fe78b84f7994a41600ded08042102ef127e333 /include | |
| parent | f3f950dba37b5bec870147aeb9878a157a6eb875 (diff) | |
| parent | a7c3a0d5f8d8cd5cdb32c06d4d68f5b4e4d2104b (diff) | |
| download | linux-0072a0c14d5b7cb72c611d396f143f5dcd73ebe2.tar.bz2 | |
Merge tag 'media/v4.20-4' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
Pull media fixes from Mauro Carvalho Chehab:
- Revert a dt-bindings patch whose driver didn't make for 4.20
- fix a kernel oops at vicodec driver
- fix a frame overflow at gspca with was causing regressions on some
cameras, making them to not work
- use the proper type for wait_queue head
- make media request API compatible with 32-bit userspace on 64-bit
kernel
- fix a regression on Kernel 4.19 at dvb-pll
- don't use SPDX headers yet for GFDL
* tag 'media/v4.20-4' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
media: mediactl docs: Fix licensing message
media: dvb-pll: don't re-validate tuner frequencies
media: dvb-pll: fix tuner frequency ranges
media: Revert "media: dt-bindings: Document the Rockchip VPU bindings"
media: gspca: fix frame overflow error
media: vicodec: fix memchr() kernel oops
media: cedrus: add action item to the TODO
media: media-request: Add compat ioctl
media: Use wait_queue_head_t for media_request
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/media-request.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/media/media-request.h b/include/media/media-request.h index 0ce75c35131f..bd36d7431698 100644 --- a/include/media/media-request.h +++ b/include/media/media-request.h @@ -68,7 +68,7 @@ struct media_request { unsigned int access_count; struct list_head objects; unsigned int num_incomplete_objects; - struct wait_queue_head poll_wait; + wait_queue_head_t poll_wait; spinlock_t lock; }; |