From: Krzysztof Hałasa Date: Fri, 11 Feb 2011 12:29:59 +0000 (+0100) Subject: staging: Solo6x10: Align MPEG video on 8-byte boundary instead of 32-byte. X-Git-Tag: MMI-PSA29.97-13-9~20521^2~562 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=856e22d3cd3c38399be796b80bcf57769eefeee3;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git 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 Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/solo6x10/solo6010-enc.c b/drivers/staging/solo6x10/solo6010-enc.c index 481a49277f77..7e28f7dbbbdd 100644 --- 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 83d89318f94a..b504d594c3af 100644 --- 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,