Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelv...

[pandora-kernel.git] / drivers / staging / go7007 / go7007-v4l2.c

diff --git a/drivers/staging/go7007/go7007-v4l2.c b/drivers/staging/go7007/go7007-v4l2.c
index 723c1a6..2b27d8d 100644 (file)
--- a/drivers/staging/go7007/go7007-v4l2.c
+++ b/drivers/staging/go7007/go7007-v4l2.c
@@ -252,23 +252,22 @@ static int set_capture_size(struct go7007 *go, struct v4l2_format *fmt, int try)
                go->modet_map[i] = 0;
 
        if (go->board_info->sensor_flags & GO7007_SENSOR_SCALING) {
-               struct v4l2_format res;
+               struct v4l2_mbus_framefmt mbus_fmt;
 
-               if (fmt != NULL) {
-                       res = *fmt;
-               } else {
-                       res.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-                       res.fmt.pix.width = width;
-               }
+               mbus_fmt.code = V4L2_MBUS_FMT_FIXED;
+               if (fmt != NULL)
+                       mbus_fmt.width = fmt->fmt.pix.width;
+               else
+                       mbus_fmt.width = width;
 
                if (height > sensor_height / 2) {
-                       res.fmt.pix.height = height / 2;
+                       mbus_fmt.height = height / 2;
                        go->encoder_v_halve = 0;
                } else {
-                       res.fmt.pix.height = height;
+                       mbus_fmt.height = height;
                        go->encoder_v_halve = 1;
                }
-               call_all(&go->v4l2_dev, video, s_fmt, &res);
+               call_all(&go->v4l2_dev, video, s_mbus_fmt, &mbus_fmt);
        } else {
                if (width <= sensor_width / 4) {
                        go->encoder_h_halve = 1;
@@ -720,7 +719,7 @@ static int vidioc_reqbufs(struct file *file, void *priv,
                if (count > 32)
                        count = 32;
 
-               gofh->bufs = kmalloc(count * sizeof(struct go7007_buffer),
+               gofh->bufs = kcalloc(count, sizeof(struct go7007_buffer),
                                     GFP_KERNEL);
 
                if (!gofh->bufs) {
@@ -728,8 +727,6 @@ static int vidioc_reqbufs(struct file *file, void *priv,
                        goto unlock_and_return;
                }
 
-               memset(gofh->bufs, 0, count * sizeof(struct go7007_buffer));
-
                for (i = 0; i < count; ++i) {
                        gofh->bufs[i].go = go;
                        gofh->bufs[i].index = i;