diff options
author | Ingo Molnar <mingo@kernel.org> | 2016-11-24 07:09:08 +0300 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2016-11-24 07:09:08 +0300 |
commit | 69e6cdd0cf16f645be39038e5ccc9379e3923d00 (patch) | |
tree | 3edb32b07ef37be1536f6510ec8e7caaf5acbbb8 /drivers/media/usb/b2c2/flexcop-usb.h | |
parent | 6a6b12e2125591e24891e6860410795ea53aed11 (diff) | |
parent | 10b9dd56860e93f11cd352e8c75a33357b80b70b (diff) | |
download | linux-69e6cdd0cf16f645be39038e5ccc9379e3923d00.tar.xz |
Merge branch 'linus' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
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 |