diff options
author | Sascha Sommer <saschasommer@freenet.de> | 2005-11-09 00:37:33 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-09 10:56:18 -0500 |
commit | 74458e6c1aea9e422e46030e7bc61e9b0984be5b (patch) | |
tree | a3eb63aee04b2ac457ed44e888a15762c2cc3e13 /drivers/media/video/em28xx/em28xx-video.c | |
parent | d5e5265315770bda46c50ecaa64e2b9790f2064c (diff) |
[PATCH] v4l: 786: chip id removed since it isn t required anymore
- Chip_id removed since it isn't required anymore.
Signed-off-by: Sascha Sommer <saschasommer@freenet.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/media/video/em28xx/em28xx-video.c')
-rw-r--r-- | drivers/media/video/em28xx/em28xx-video.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c index f3fc44b352b4..048ad1d77bab 100644 --- a/drivers/media/video/em28xx/em28xx-video.c +++ b/drivers/media/video/em28xx/em28xx-video.c | |||
@@ -1272,6 +1272,18 @@ static int em2820_video_do_ioctl(struct inode *inode, struct file *filp, | |||
1272 | if (width > maxw) | 1272 | if (width > maxw) |
1273 | width = maxw; | 1273 | width = maxw; |
1274 | 1274 | ||
1275 | /* FIXME*/ | ||
1276 | if(dev->is_em2800){ | ||
1277 | /* we only know how to scale to 50% */ | ||
1278 | if(height % (maxh / 2)) | ||
1279 | height=maxh; | ||
1280 | if(width % (maxw / 2)) | ||
1281 | width=maxw; | ||
1282 | /* larger resoltion don't seem to work either */ | ||
1283 | if(width == maxw && height == maxh) | ||
1284 | width /= 2; | ||
1285 | } | ||
1286 | |||
1275 | if ((hscale = | 1287 | if ((hscale = |
1276 | (((unsigned long)maxw) << 12) / width - 4096L) >= | 1288 | (((unsigned long)maxw) << 12) / width - 4096L) >= |
1277 | 0x4000) | 1289 | 0x4000) |