aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/em28xx/em28xx.h
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2007-11-10 23:13:49 -0500
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-01-25 16:02:07 -0500
commit9e31ced888d1ca49ec5be51ef295e3ce994366c4 (patch)
tree23593504461672ce1f6ef405171b859c42404019 /drivers/media/video/em28xx/em28xx.h
parenta225452ef80a7bd894fd2dfd01a4973d444152f4 (diff)
V4L/DVB (6584): Fix read() method
Backport read() fixes from Markus Rechberger. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/em28xx/em28xx.h')
-rw-r--r--drivers/media/video/em28xx/em28xx.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/video/em28xx/em28xx.h b/drivers/media/video/em28xx/em28xx.h
index 3efc05d2df67..672880383de8 100644
--- a/drivers/media/video/em28xx/em28xx.h
+++ b/drivers/media/video/em28xx/em28xx.h
@@ -260,6 +260,7 @@ struct em28xx {
260 int vscale; /* vertical scale factor (see datasheet) */ 260 int vscale; /* vertical scale factor (see datasheet) */
261 int interlaced; /* 1=interlace fileds, 0=just top fileds */ 261 int interlaced; /* 1=interlace fileds, 0=just top fileds */
262 int type; 262 int type;
263 unsigned int video_bytesread; /* Number of bytes read */
263 264
264 unsigned long hash; /* eeprom hash - for boards with generic ID */ 265 unsigned long hash; /* eeprom hash - for boards with generic ID */
265 unsigned long i2c_hash; /* i2c devicelist hash - for boards with generic ID */ 266 unsigned long i2c_hash; /* i2c devicelist hash - for boards with generic ID */
@@ -268,6 +269,7 @@ struct em28xx {
268 enum em28xx_dev_state state; 269 enum em28xx_dev_state state;
269 enum em28xx_stream_state stream; 270 enum em28xx_stream_state stream;
270 enum em28xx_io_method io; 271 enum em28xx_io_method io;
272
271 /* locks */ 273 /* locks */
272 struct mutex lock; 274 struct mutex lock;
273 spinlock_t queue_lock; 275 spinlock_t queue_lock;