Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6

[linux-2.6-omap-h63xx.git] / drivers / media / video / gspca / spca505.c

diff --git a/drivers/media/video/gspca/spca505.c b/drivers/media/video/gspca/spca505.c
index 3c2be80cbd65033c0ba507fc0068948a88c2ffbf..eda29d609359fdd2833cb31426e1e3620cc8639e 100644 (file)
--- a/drivers/media/video/gspca/spca505.c
+++ b/drivers/media/video/gspca/spca505.c
@@ -61,27 +61,27 @@ static struct ctrl sd_ctrls[] = {
 
 static struct v4l2_pix_format vga_mode[] = {
        {160, 120, V4L2_PIX_FMT_SPCA505, V4L2_FIELD_NONE,
-               .bytesperline = 160 * 3,
+               .bytesperline = 160,
                .sizeimage = 160 * 120 * 3 / 2,
                .colorspace = V4L2_COLORSPACE_SRGB,
                .priv = 5},
        {176, 144, V4L2_PIX_FMT_SPCA505, V4L2_FIELD_NONE,
-               .bytesperline = 176 * 3,
+               .bytesperline = 176,
                .sizeimage = 176 * 144 * 3 / 2,
                .colorspace = V4L2_COLORSPACE_SRGB,
                .priv = 4},
        {320, 240, V4L2_PIX_FMT_SPCA505, V4L2_FIELD_NONE,
-               .bytesperline = 320 * 3,
+               .bytesperline = 320,
                .sizeimage = 320 * 240 * 3 / 2,
                .colorspace = V4L2_COLORSPACE_SRGB,
                .priv = 2},
        {352, 288, V4L2_PIX_FMT_SPCA505, V4L2_FIELD_NONE,
-               .bytesperline = 352 * 3,
+               .bytesperline = 352,
                .sizeimage = 352 * 288 * 3 / 2,
                .colorspace = V4L2_COLORSPACE_SRGB,
                .priv = 1},
        {640, 480, V4L2_PIX_FMT_SPCA505, V4L2_FIELD_NONE,
-               .bytesperline = 640 * 3,
+               .bytesperline = 640,
                .sizeimage = 640 * 480 * 3 / 2,
                .colorspace = V4L2_COLORSPACE_SRGB,
                .priv = 0},
@@ -776,7 +776,7 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
        default:
                data += 1;
                len -= 1;
-               gspca_frame_add(gspca_dev, FIRST_PACKET, frame,
+               gspca_frame_add(gspca_dev, INTER_PACKET, frame,
                                data, len);
                break;
        }