diff options
| author | Samreen <samreen@ti.com> | 2010-08-16 18:04:09 +0530 |
|---|---|---|
| committer | Ricardo Perez Olivares <x0081762@ti.com> | 2010-09-14 19:27:32 -0500 |
| commit | 10181ed6b1ac5f52d5d4ece1daf598c1302fd15f (patch) | |
| tree | 2208d6ac675bacc62fa9afc757efdd891890e2ea /drivers/media | |
| parent | 1677fd299e2b27f28f060ad7b4b58595ae207d4e (diff) | |
Removal of warnings & code cleanup
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/video/omap/omap_wb.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/media/video/omap/omap_wb.c b/drivers/media/video/omap/omap_wb.c index 820408d1d61f..f6ed1f51d005 100644 --- a/drivers/media/video/omap/omap_wb.c +++ b/drivers/media/video/omap/omap_wb.c @@ -70,7 +70,7 @@ MODULE_PARM_DESC(debug_wb, "Debug level (0-1)"); int omap_vout_try_format(struct v4l2_pix_format *pix); enum omap_color_mode video_mode_to_dss_mode( - struct v4l2_pix_format *pix); + struct v4l2_pix_format *pix); void omap_wb_isr(void *arg, unsigned int irqstatus); int omap_dss_wb_apply(struct omap_overlay_manager *mgr, struct omap_writeback *wb); int omap_dss_wb_flush(void); @@ -300,15 +300,15 @@ static int vidioc_reqbufs(struct file *file, void *fh, } videobuf_mmap_free(q); - } else if (q->bufs[0] && (V4L2_MEMORY_USERPTR == q->bufs[0]->memory)) { - if (wb->buffer_allocated) { - videobuf_mmap_free(q); - for (i = 0; i < wb->buffer_allocated; i++) { - kfree(q->bufs[i]); - q->bufs[i] = NULL; - } - wb->buffer_allocated = 0; + } else if (q->bufs[0] && (V4L2_MEMORY_USERPTR == q->bufs[0]->memory)) { + if (wb->buffer_allocated) { + videobuf_mmap_free(q); + for (i = 0; i < wb->buffer_allocated; i++) { + kfree(q->bufs[i]); + q->bufs[i] = NULL; } + wb->buffer_allocated = 0; + } } /*store the memory type in data structure */ wb->memory = req->memory; |