diff options
author | Aidan Thornton <makosoft@googlemail.com> | 2008-04-13 13:38:47 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-04-24 13:08:00 -0400 |
commit | d7aa80207babe694b316a48200b096cf0336ecb3 (patch) | |
tree | 5984ce3c1c9192f94db74a93459eb811c9484a91 /drivers/media/video/em28xx/em28xx.h | |
parent | ad0ebb96c220c461386e9a765fca3daf5590d01e (diff) |
V4L/DVB (7541): em28xx: Some fixes to videobuf
It fixes a couple of minor bugs, comments out a bogus BUG_ON, sets fh->type
correctly, uses dev->width and dev->height for now, and adds a missing spinlock
init (nasty - caused a system lockup). It also adds some debug code which
probably isn't all that useful. I haven't tested this version of the patch yet,
though, so I'm not sure what you can expect if you try it.
Signed-off-by: Aidan Thornton <makosoft@googlemail.com>
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.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/video/em28xx/em28xx.h b/drivers/media/video/em28xx/em28xx.h index dd18ceb30a4..af15fd3f4f8 100644 --- a/drivers/media/video/em28xx/em28xx.h +++ b/drivers/media/video/em28xx/em28xx.h | |||
@@ -301,7 +301,6 @@ struct em28xx { | |||
301 | int hscale; /* horizontal scale factor (see datasheet) */ | 301 | int hscale; /* horizontal scale factor (see datasheet) */ |
302 | int vscale; /* vertical scale factor (see datasheet) */ | 302 | int vscale; /* vertical scale factor (see datasheet) */ |
303 | int interlaced; /* 1=interlace fileds, 0=just top fileds */ | 303 | int interlaced; /* 1=interlace fileds, 0=just top fileds */ |
304 | int type; | ||
305 | unsigned int video_bytesread; /* Number of bytes read */ | 304 | unsigned int video_bytesread; /* Number of bytes read */ |
306 | 305 | ||
307 | unsigned long hash; /* eeprom hash - for boards with generic ID */ | 306 | unsigned long hash; /* eeprom hash - for boards with generic ID */ |
@@ -317,7 +316,7 @@ struct em28xx { | |||
317 | 316 | ||
318 | /* locks */ | 317 | /* locks */ |
319 | struct mutex lock; | 318 | struct mutex lock; |
320 | spinlock_t queue_lock; | 319 | /* spinlock_t queue_lock; */ |
321 | struct list_head inqueue, outqueue; | 320 | struct list_head inqueue, outqueue; |
322 | wait_queue_head_t open, wait_frame, wait_stream; | 321 | wait_queue_head_t open, wait_frame, wait_stream; |
323 | struct video_device *vbi_dev; | 322 | struct video_device *vbi_dev; |