1 files changed, 6 insertions, 10 deletions

diff --git a/drivers/media/platform/omap/omap_vout.c b/drivers/media/platform/omap/omap_vout.c
index 2d177fa58471..64ab6fb06b9c 100644
--- a/drivers/media/platform/omap/omap_vout.c
+++ b/drivers/media/platform/omap/omap_vout.c
@@ -369,7 +369,7 @@ static int omapvid_setup_overlay(struct omap_vout_device *vout,
 {
         int ret = 0;
         struct omap_overlay_info info;
-        int cropheight, cropwidth, pixheight, pixwidth;
+        int cropheight, cropwidth, pixwidth;
 
         if ((ovl->caps & OMAP_DSS_OVL_CAP_SCALE) == 0 &&
                         (outw != vout->pix.width || outh != vout->pix.height)) {
@@ -389,12 +389,10 @@ static int omapvid_setup_overlay(struct omap_vout_device *vout,
         if (is_rotation_90_or_270(vout)) {
                 cropheight = vout->crop.width;
                 cropwidth = vout->crop.height;
-                pixheight = vout->pix.width;
                 pixwidth = vout->pix.height;
         } else {
                 cropheight = vout->crop.height;
                 cropwidth = vout->crop.width;
-                pixheight = vout->pix.height;
                 pixwidth = vout->pix.width;
         }
 
@@ -991,7 +989,7 @@ static int omap_vout_release(struct file *file)
                 mask = DISPC_IRQ_VSYNC | DISPC_IRQ_EVSYNC_EVEN |
                         DISPC_IRQ_EVSYNC_ODD | DISPC_IRQ_VSYNC2;
                 omap_dispc_unregister_isr(omap_vout_isr, vout, mask);
-                vout->streaming = 0;
+                vout->streaming = false;
 
                 videobuf_streamoff(q);
                 videobuf_queue_cancel(q);
@@ -1451,12 +1449,10 @@ static int vidioc_s_ctrl(struct file *file, void *fh, struct v4l2_control *a)
         }
         case V4L2_CID_VFLIP:
         {
-                struct omap_overlay *ovl;
                 struct omapvideo_info *ovid;
                 unsigned int  mirror = a->value;
 
                 ovid = &vout->vid_info;
-                ovl = ovid->overlays[0];
 
                 mutex_lock(&vout->lock);
                 if (mirror && ovid->rotation_type == VOUT_ROT_NONE) {
@@ -1489,7 +1485,7 @@ static int vidioc_reqbufs(struct file *file, void *fh,
         struct omap_vout_device *vout = fh;
         struct videobuf_queue *q = &vout->vbq;
 
-        if ((req->type != V4L2_BUF_TYPE_VIDEO_OUTPUT) || (req->count < 0))
+        if (req->type != V4L2_BUF_TYPE_VIDEO_OUTPUT)
                 return -EINVAL;
         /* if memory is not mmp or userptr
            return error */
@@ -1648,7 +1644,7 @@ static int vidioc_streamon(struct file *file, void *fh, enum v4l2_buf_type i)
         vout->field_id = 0;
 
         /* set flag here. Next QBUF will start DMA */
-        vout->streaming = 1;
+        vout->streaming = true;
 
         vout->first_int = 1;
 
@@ -1708,7 +1704,7 @@ static int vidioc_streamoff(struct file *file, void *fh, enum v4l2_buf_type i)
         if (!vout->streaming)
                 return -EINVAL;
 
-        vout->streaming = 0;
+        vout->streaming = false;
         mask = DISPC_IRQ_VSYNC | DISPC_IRQ_EVSYNC_EVEN | DISPC_IRQ_EVSYNC_ODD
                 | DISPC_IRQ_VSYNC2;
 
@@ -1916,7 +1912,7 @@ static int __init omap_vout_setup_video_data(struct omap_vout_device *vout)
         control[0].id = V4L2_CID_ROTATE;
         control[0].value = 0;
         vout->rotation = 0;
-        vout->mirror = 0;
+        vout->mirror = false;
         vout->control[2].id = V4L2_CID_HFLIP;
         vout->control[2].value = 0;
         if (vout->vid_info.rotation_type == VOUT_ROT_VRFB)