staging: Solo6x10: Align MPEG video on 8-byte boundary instead of 32-byte.

Solo-6110 only supports 8-byte alignment anyway.

Signed-off-by: Krzysztof Hałasa <khalasa@piap.pl>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/solo6x10/solo6010-enc.c b/drivers/staging/solo6x10/solo6010-enc.c
index 481a49277f77a4324cb7a23fd5620eb8adabc661..7e28f7dbbbddae1b2931bd00eae86f9cb52003b3 100644 (file)
--- a/drivers/staging/solo6x10/solo6010-enc.c
+++ b/drivers/staging/solo6x10/solo6010-enc.c
@@ -176,7 +176,6 @@ static void solo_mp4e_config(struct solo6010_dev *solo_dev)
                       SOLO_VE_BLOCK_BASE(SOLO_MP4E_EXT_ADDR(solo_dev) >> 16));
 
        solo_reg_write(solo_dev, SOLO_VE_CFG1,
-                      SOLO_VE_BYTE_ALIGN(2) |
                       SOLO_VE_INSERT_INDEX | SOLO_VE_MOTION_MODE(0));
 
        solo_reg_write(solo_dev, SOLO_VE_WMRK_POLY, 0);

diff --git a/drivers/staging/solo6x10/solo6010-v4l2-enc.c b/drivers/staging/solo6x10/solo6010-v4l2-enc.c
index 83d89318f94a5703559fd4e755e4a65870a5171a..b504d594c3af433d9a4991fd3ddd46b38579c963 100644 (file)
--- a/drivers/staging/solo6x10/solo6010-v4l2-enc.c
+++ b/drivers/staging/solo6x10/solo6010-v4l2-enc.c
@@ -754,7 +754,7 @@ void solo_enc_v4l2_isr(struct solo6010_dev *solo_dev)
 
        cur_q = ((solo_reg_read(solo_dev, SOLO_VE_STATE(11)) & 0xF) + 1) % MP4_QS;
 
-       reg_mpeg_size = ((solo_reg_read(solo_dev, SOLO_VE_STATE(0)) & 0xFFFFF) + 64 + 32) & ~31;
+       reg_mpeg_size = ((solo_reg_read(solo_dev, SOLO_VE_STATE(0)) & 0xFFFFF) + 64 + 8) & ~7;
 
        while (solo_dev->enc_idx != cur_q) {
                mpeg_current = solo_reg_read(solo_dev,