summaryrefslogtreecommitdiffstats
path: root/drivers/media/platform
diff options
context:
space:
mode:
authorLinus Torvalds2019-08-16 17:59:33 +0200
committerLinus Torvalds2019-08-16 17:59:33 +0200
commit9da5bb24bb368567a43ac2df0e108e43d80f3564 (patch)
tree2ae20063d159095dabad4f7a0eebb3d3aef2586d /drivers/media/platform
parentMerge tag 'sound-5.3-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/ti... (diff)
parentomap-dma/omap_vout_vrfb: fix off-by-one fi value (diff)
downloadkernel-qcow2-linux-9da5bb24bb368567a43ac2df0e108e43d80f3564.tar.gz
kernel-qcow2-linux-9da5bb24bb368567a43ac2df0e108e43d80f3564.tar.xz
kernel-qcow2-linux-9da5bb24bb368567a43ac2df0e108e43d80f3564.zip
Merge tag 'dmaengine-fix-5.3-rc5' of git://git.infradead.org/users/vkoul/slave-dma
Pull dmaengine fixes from Vinod Koul: "Fixes in dmaengine drivers for: - dw-edma: endianess, _iomem type and stack usages - ste_dma40: unneeded variable and null-pointer dereference - tegra210-adma: unused function - omap-dma: off-by-one fix" * tag 'dmaengine-fix-5.3-rc5' of git://git.infradead.org/users/vkoul/slave-dma: omap-dma/omap_vout_vrfb: fix off-by-one fi value dmaengine: stm32-mdma: Fix a possible null-pointer dereference in stm32_mdma_irq_handler() dmaengine: tegra210-adma: Fix unused function warnings dmaengine: ste_dma40: fix unneeded variable warning dmaengine: dw-edma: fix endianess confusion dmaengine: dw-edma: fix __iomem type confusion dmaengine: dw-edma: fix unnecessary stack usage
Diffstat (limited to 'drivers/media/platform')
-rw-r--r--drivers/media/platform/omap/omap_vout_vrfb.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/platform/omap/omap_vout_vrfb.c b/drivers/media/platform/omap/omap_vout_vrfb.c
index 29e3f5da59c1..11ec048929e8 100644
--- a/drivers/media/platform/omap/omap_vout_vrfb.c
+++ b/drivers/media/platform/omap/omap_vout_vrfb.c
@@ -253,8 +253,7 @@ int omap_vout_prepare_vrfb(struct omap_vout_device *vout,
*/
pixsize = vout->bpp * vout->vrfb_bpp;
- dst_icg = ((MAX_PIXELS_PER_LINE * pixsize) -
- (vout->pix.width * vout->bpp)) + 1;
+ dst_icg = MAX_PIXELS_PER_LINE * pixsize - vout->pix.width * vout->bpp;
xt->src_start = vout->buf_phy_addr[vb->i];
xt->dst_start = vout->vrfb_context[vb->i].paddr[0];