1 files changed, 6 insertions, 8 deletions

diff --git a/drivers/crypto/sahara.c b/drivers/crypto/sahara.c
index 1d9ecd368b5b..08e7bdcaa6e3 100644
--- a/drivers/crypto/sahara.c
+++ b/drivers/crypto/sahara.c
@@ -202,7 +202,6 @@ struct sahara_dev {
         struct completion       dma_completion;
 
         struct sahara_ctx       *ctx;
-        spinlock_t              lock;
         struct crypto_queue     queue;
         unsigned long           flags;
 
@@ -543,10 +542,10 @@ static int sahara_hw_descriptor_create(struct sahara_dev *dev)
 
 unmap_out:
         dma_unmap_sg(dev->device, dev->out_sg, dev->nb_out_sg,
-                DMA_TO_DEVICE);
+                DMA_FROM_DEVICE);
 unmap_in:
         dma_unmap_sg(dev->device, dev->in_sg, dev->nb_in_sg,
-                DMA_FROM_DEVICE);
+                DMA_TO_DEVICE);
 
         return -EINVAL;
 }
@@ -594,9 +593,9 @@ static int sahara_aes_process(struct ablkcipher_request *req)
         }
 
         dma_unmap_sg(dev->device, dev->out_sg, dev->nb_out_sg,
-                DMA_TO_DEVICE);
-        dma_unmap_sg(dev->device, dev->in_sg, dev->nb_in_sg,
                 DMA_FROM_DEVICE);
+        dma_unmap_sg(dev->device, dev->in_sg, dev->nb_in_sg,
+                DMA_TO_DEVICE);
 
         return 0;
 }
@@ -1376,13 +1375,13 @@ static void sahara_unregister_algs(struct sahara_dev *dev)
                         crypto_unregister_ahash(&sha_v4_algs[i]);
 }
 
-static struct platform_device_id sahara_platform_ids[] = {
+static const struct platform_device_id sahara_platform_ids[] = {
         { .name = "sahara-imx27" },
         { /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(platform, sahara_platform_ids);
 
-static struct of_device_id sahara_dt_ids[] = {
+static const struct of_device_id sahara_dt_ids[] = {
         { .compatible = "fsl,imx53-sahara" },
         { .compatible = "fsl,imx27-sahara" },
         { /* sentinel */ }
@@ -1487,7 +1486,6 @@ static int sahara_probe(struct platform_device *pdev)
 
         crypto_init_queue(&dev->queue, SAHARA_QUEUE_LENGTH);
 
-        spin_lock_init(&dev->lock);
         mutex_init(&dev->queue_mutex);
 
         dev_ptr = dev;