diff options
Diffstat (limited to 'drivers/crypto/omap-des.c')
-rw-r--r-- | drivers/crypto/omap-des.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/crypto/omap-des.c b/drivers/crypto/omap-des.c index 0a70e46d5416..dd7b93f2f94c 100644 --- a/drivers/crypto/omap-des.c +++ b/drivers/crypto/omap-des.c | |||
@@ -527,8 +527,6 @@ static void omap_des_finish_req(struct omap_des_dev *dd, int err) | |||
527 | 527 | ||
528 | static int omap_des_crypt_dma_stop(struct omap_des_dev *dd) | 528 | static int omap_des_crypt_dma_stop(struct omap_des_dev *dd) |
529 | { | 529 | { |
530 | int err = 0; | ||
531 | |||
532 | pr_debug("total: %d\n", dd->total); | 530 | pr_debug("total: %d\n", dd->total); |
533 | 531 | ||
534 | omap_des_dma_stop(dd); | 532 | omap_des_dma_stop(dd); |
@@ -536,7 +534,7 @@ static int omap_des_crypt_dma_stop(struct omap_des_dev *dd) | |||
536 | dmaengine_terminate_all(dd->dma_lch_in); | 534 | dmaengine_terminate_all(dd->dma_lch_in); |
537 | dmaengine_terminate_all(dd->dma_lch_out); | 535 | dmaengine_terminate_all(dd->dma_lch_out); |
538 | 536 | ||
539 | return err; | 537 | return 0; |
540 | } | 538 | } |
541 | 539 | ||
542 | static int omap_des_copy_needed(struct scatterlist *sg) | 540 | static int omap_des_copy_needed(struct scatterlist *sg) |
@@ -1086,6 +1084,7 @@ static int omap_des_probe(struct platform_device *pdev) | |||
1086 | dd->phys_base = res->start; | 1084 | dd->phys_base = res->start; |
1087 | 1085 | ||
1088 | pm_runtime_enable(dev); | 1086 | pm_runtime_enable(dev); |
1087 | pm_runtime_irq_safe(dev); | ||
1089 | err = pm_runtime_get_sync(dev); | 1088 | err = pm_runtime_get_sync(dev); |
1090 | if (err < 0) { | 1089 | if (err < 0) { |
1091 | pm_runtime_put_noidle(dev); | 1090 | pm_runtime_put_noidle(dev); |