Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

[mirror_ubuntu-artful-kernel.git] / drivers / crypto / img-hash.c

diff --git a/drivers/crypto/img-hash.c b/drivers/crypto/img-hash.c
index a2e77b87485bea56ae00ba9df51d06eafae315a7..9b07f3d88febff92cbd2e44527f513c2b3ec09ac 100644 (file)
--- a/drivers/crypto/img-hash.c
+++ b/drivers/crypto/img-hash.c
@@ -226,7 +226,7 @@ static int img_hash_xmit_dma(struct img_hash_dev *hdev, struct scatterlist *sg)
        struct dma_async_tx_descriptor *desc;
        struct img_hash_request_ctx *ctx = ahash_request_ctx(hdev->req);
 
-       ctx->dma_ct = dma_map_sg(hdev->dev, sg, 1, DMA_MEM_TO_DEV);
+       ctx->dma_ct = dma_map_sg(hdev->dev, sg, 1, DMA_TO_DEVICE);
        if (ctx->dma_ct == 0) {
                dev_err(hdev->dev, "Invalid DMA sg\n");
                hdev->err = -EINVAL;
@@ -241,7 +241,7 @@ static int img_hash_xmit_dma(struct img_hash_dev *hdev, struct scatterlist *sg)
        if (!desc) {
                dev_err(hdev->dev, "Null DMA descriptor\n");
                hdev->err = -EINVAL;
-               dma_unmap_sg(hdev->dev, sg, 1, DMA_MEM_TO_DEV);
+               dma_unmap_sg(hdev->dev, sg, 1, DMA_TO_DEVICE);
                return -EINVAL;
        }
        desc->callback = img_hash_dma_callback;