aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/drivers/media/platform
diff options
context:
space:
mode:
authorShuah Khan <shuahkh@osg.samsung.com>2016-10-18 21:28:22 -0200
committerMauro Carvalho Chehab <mchehab@s-opensource.com>2016-11-16 16:25:37 -0200
commit0f7a55b4e09fc51413cb9175ee6e701aa6878308 (patch)
tree9a9fd4bb43dee9b3e270de0c37a0729cd641a0a0 /drivers/media/platform
parent[media] exynos4-is: fimc: Roundup imagesize to row size for tiled formats (diff)
downloadwireguard-linux-0f7a55b4e09fc51413cb9175ee6e701aa6878308.tar.xz
wireguard-linux-0f7a55b4e09fc51413cb9175ee6e701aa6878308.zip
[media] s5p-mfc: Collapse two error message into one
s5p_mfc_alloc_priv_buf() prints two message to report invalid memory configuration error. Collapse them into a single message. Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com> Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'drivers/media/platform')
-rw-r--r--drivers/media/platform/s5p-mfc/s5p_mfc_opr.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr.c b/drivers/media/platform/s5p-mfc/s5p_mfc_opr.c
index 1e7250260a9a..f0f5e8ce5416 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr.c
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc_opr.c
@@ -50,8 +50,7 @@ int s5p_mfc_alloc_priv_buf(struct device *dev, dma_addr_t base,
}
if (b->dma < base) {
- mfc_err("Invaling memory configuration!\n");
- mfc_err("Allocated buffer (%pad) is lower than memory base address (%pad)\n",
+ mfc_err("Invalid memory configuration - buffer (%pad) is below base memory address(%pad)\n",
&b->dma, &base);
dma_free_coherent(dev, b->size, b->virt, b->dma);
return -ENOMEM;