diff options
author | Dave Airlie <airlied@redhat.com> | 2016-11-07 00:37:09 +0100 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2016-11-07 00:37:09 +0100 |
commit | 7b624ad8fea1be7ff4c22643e212191aa6a2a3c2 (patch) | |
tree | 41d0357d3259868cd85521c3fb9578cd2fc13831 /drivers/media/usb/b2c2/flexcop-usb.h | |
parent | Merge tag 'omapdrm-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/tom... (diff) | |
parent | Linux 4.9-rc4 (diff) | |
download | linux-7b624ad8fea1be7ff4c22643e212191aa6a2a3c2.tar.xz linux-7b624ad8fea1be7ff4c22643e212191aa6a2a3c2.zip |
Backmerge tag 'v4.9-rc4' into drm-next
Linux 4.9-rc4
This is needed for nouveau development.
Diffstat (limited to 'drivers/media/usb/b2c2/flexcop-usb.h')
-rw-r--r-- | drivers/media/usb/b2c2/flexcop-usb.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/media/usb/b2c2/flexcop-usb.h b/drivers/media/usb/b2c2/flexcop-usb.h index 92529a9c4475..25ad43166e78 100644 --- a/drivers/media/usb/b2c2/flexcop-usb.h +++ b/drivers/media/usb/b2c2/flexcop-usb.h @@ -29,6 +29,10 @@ struct flexcop_usb { u8 tmp_buffer[1023+190]; int tmp_buffer_length; + + /* for URB control messages */ + u8 data[80]; + struct mutex data_mutex; }; #if 0 |