diff options
| author | Archit Taneja <archit@ti.com> | 2010-07-12 17:43:48 +0530 |
|---|---|---|
| committer | Ricardo Perez Olivares <x0081762@ti.com> | 2010-09-14 19:26:48 -0500 |
| commit | efac6f7dda04ea611944cf3056fba1d6590be8e7 (patch) | |
| tree | 1b47b0a2c288b11c17021b8e0e9b4d02ff0a53db /drivers/media | |
| parent | 06d73c99b3d1390d298ff6aa4236f9bc170bc8b0 (diff) | |
OMAP: DSS2/V4L2: V4L2 WB fixes, ES2.0 changes
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/video/omap/omap_wb.c | 8 | ||||
| -rw-r--r-- | drivers/media/video/omap/omap_wbdef.h | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/drivers/media/video/omap/omap_wb.c b/drivers/media/video/omap/omap_wb.c index 84856a10e62c..fbeb4ded4e96 100644 --- a/drivers/media/video/omap/omap_wb.c +++ b/drivers/media/video/omap/omap_wb.c @@ -80,8 +80,8 @@ int omap_setup_wb(struct omap_wb_device *wb_device, u32 addr, u32 uv_addr) wb_info.info_dirty = true; wb_info.capturemode = wb_device->capturemode; wb_info.dss_mode = wb_device->dss_mode; - wb_info.height = wb_device->height; - wb_info.width = wb_device->width; + wb_info.height = wb_device->pix.height; + wb_info.width = wb_device->pix.width; wb_info.source = wb_device->source; wb_info.source_type = wb_device->source_type; wb_info.paddr = addr; @@ -414,6 +414,8 @@ static int vidioc_default_wb(struct file *file, void *fh, printk(KERN_ERR WB_NAME "invalid dss_mode\n"); r = -EINVAL; goto err; + } else { + wb->dss_mode = dss_mode; } mutex_unlock(&wb->lock); @@ -888,8 +890,6 @@ static int __init omap_wb_setup_video_data(struct omap_wb_device *wb) pix->priv = 0; pix->colorspace = V4L2_COLORSPACE_JPEG; - wb->width = pix->width; - wb->height = pix->height; wb->bpp = RGB565_BPP; wb->enabled = false; wb->buffer_allocated = 0; diff --git a/drivers/media/video/omap/omap_wbdef.h b/drivers/media/video/omap/omap_wbdef.h index accabf537b06..5139d4ce8f97 100644 --- a/drivers/media/video/omap/omap_wbdef.h +++ b/drivers/media/video/omap/omap_wbdef.h @@ -50,8 +50,6 @@ struct omap_wb_device { enum omap_color_mode dss_mode; - unsigned long width; - unsigned long height; /* we don't allow to request new buffer when old buffers are * still mmaped */ |