diff options
| author |   Philipp Zabel <p.zabel@pengutronix.de> | 2013-09-30 10:34:47 -0300 |
|---|---|---|
| committer |   Mauro Carvalho Chehab <m.chehab@samsung.com> | 2013-10-28 15:24:31 -0200 |
| commit | 0fd84dc80bfdcbe8345959100c8ad776dff75d5e (patch) | |
| tree | a739e33f1e95724e9b08bbbd20676d2ea1177c36 /drivers/media/platform/coda.c | |
| parent | [media] coda: add compressed flag to format enumeration output (diff) | |
| download | linux-dev-0fd84dc80bfdcbe8345959100c8ad776dff75d5e.tar.xz linux-dev-0fd84dc80bfdcbe8345959100c8ad776dff75d5e.zip | |
[media] coda: fix FMO value setting for CodaDx6
The register is only written on CodaDx6, so the temporary variable
to be written only needs to be initialized on CodaDx6. Also, drop
two no-op lines.
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Kamil Debski <k.debski@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media/platform/coda.c')
| -rw-r--r-- | drivers/media/platform/coda.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/media/platform/coda.c b/drivers/media/platform/coda.c index 53539c1d99a4..5fe947c3b1f7 100644 --- a/drivers/media/platform/coda.c +++ b/drivers/media/platform/coda.c @@ -2074,10 +2074,8 @@ static int coda_start_streaming(struct vb2_queue *q, unsigned int count) coda_setup_iram(ctx); if (dst_fourcc == V4L2_PIX_FMT_H264) { - value = (FMO_SLICE_SAVE_BUF_SIZE << 7); - value |= (0 & CODA_FMOPARAM_TYPE_MASK) << CODA_FMOPARAM_TYPE_OFFSET; - value |= 0 & CODA_FMOPARAM_SLICENUM_MASK; if (dev->devtype->product == CODA_DX6) { + value = FMO_SLICE_SAVE_BUF_SIZE << 7; coda_write(dev, value, CODADX6_CMD_ENC_SEQ_FMO); } else { coda_write(dev, ctx->iram_info.search_ram_paddr, |