Merge remote-tracking branch 'iommu/next'

[deliverable/linux.git] / drivers / crypto / rockchip / rk3288_crypto.c

diff --git a/drivers/crypto/rockchip/rk3288_crypto.c b/drivers/crypto/rockchip/rk3288_crypto.c
index af508258d2ea28eb09dc3511c074c2cb27743c0d..d0f80c6241f951636d2083ced5ea305100f9cf5d 100644 (file)
--- a/drivers/crypto/rockchip/rk3288_crypto.c
+++ b/drivers/crypto/rockchip/rk3288_crypto.c
@@ -304,11 +304,9 @@ static int rk_crypto_probe(struct platform_device *pdev)
        usleep_range(10, 20);
        reset_control_deassert(crypto_info->rst);
 
-       err = devm_add_action(dev, rk_crypto_action, crypto_info);
-       if (err) {
-               reset_control_assert(crypto_info->rst);
+       err = devm_add_action_or_reset(dev, rk_crypto_action, crypto_info);
+       if (err)
                goto err_crypto;
-       }
 
        spin_lock_init(&crypto_info->lock);