You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
31 lines
1.0 KiB
Diff
31 lines
1.0 KiB
Diff
From ced02a1fdc5d9d394bffe4427021de238a0ad697 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Horia=20Geant=C4=83?= <horia.geanta@nxp.com>
|
|
Date: Fri, 4 Oct 2019 14:07:03 +0300
|
|
Subject: [PATCH] dma: caam: fix compilation error
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Fix compilation error, introduced by incorrect rebase of the
|
|
commit 9c51c141264c ("dma: caam: add dma memcpy driver"
|
|
on top of upstream
|
|
commit 1bcdf5a00f41 ("crypto: caam - make CAAM_PTR_SZ dynamic")
|
|
|
|
Fixes: 9c51c141264c ("dma: caam: add dma memcpy driver")
|
|
Signed-off-by: Horia Geantă <horia.geanta@nxp.com>
|
|
---
|
|
drivers/dma/caam_dma.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
--- a/drivers/dma/caam_dma.c
|
|
+++ b/drivers/dma/caam_dma.c
|
|
@@ -47,7 +47,7 @@
|
|
#include "../crypto/caam/error.h"
|
|
#include "../crypto/caam/desc_constr.h"
|
|
|
|
-#define DESC_DMA_MEMCPY_LEN ((CAAM_DESC_BYTES_MAX - DESC_JOB_IO_LEN) / \
|
|
+#define DESC_DMA_MEMCPY_LEN ((CAAM_DESC_BYTES_MAX - DESC_JOB_IO_LEN_MIN) / \
|
|
CAAM_CMD_SZ)
|
|
|
|
/*
|