Merge tag 'pwm/for-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry...

[firefly-linux-kernel-4.4.55.git] / drivers / crypto / mxs-dcp.c

diff --git a/drivers/crypto/mxs-dcp.c b/drivers/crypto/mxs-dcp.c
index 829d6394fb3334cded7c4d5a9f4c4b7d5b5c26d0..59ed54e464a96ed6af707f8bb2617b2314976e0b 100644 (file)
--- a/drivers/crypto/mxs-dcp.c
+++ b/drivers/crypto/mxs-dcp.c
@@ -153,7 +153,7 @@ static int mxs_dcp_start_dma(struct dcp_async_ctx *actx)
        struct dcp *sdcp = global_sdcp;
        const int chan = actx->chan;
        uint32_t stat;
-       int ret;
+       unsigned long ret;
        struct dcp_dma_desc *desc = &sdcp->coh->desc[actx->chan];
 
        dma_addr_t desc_phys = dma_map_single(sdcp->dev, desc, sizeof(*desc),