Patch "crypto: jh7110 - Correct deferred probe return" has been added to the 6.7-stable tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



This is a note to let you know that I've just added the patch titled

    crypto: jh7110 - Correct deferred probe return

to the 6.7-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     crypto-jh7110-correct-deferred-probe-return.patch
and it can be found in the queue-6.7 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit cec92c477ee3b1ab16e6f8bc22993898914e4d13
Author: Chanho Park <chanho61.park@xxxxxxxxxxx>
Date:   Thu Nov 9 15:32:59 2023 +0900

    crypto: jh7110 - Correct deferred probe return
    
    [ Upstream commit d57343022b71b9f41e731282dbe0baf0cff6ada8 ]
    
    This fixes list_add corruption error when the driver is returned
    with -EPROBE_DEFER. It is also required to roll back the previous
    probe sequences in case of deferred_probe. So, this removes
    'err_probe_defer" goto label and just use err_dma_init instead.
    
    Fixes: 42ef0e944b01 ("crypto: starfive - Add crypto engine support")
    Signed-off-by: Chanho Park <chanho61.park@xxxxxxxxxxx>
    Reviewed-by: Jia Jie Ho <jiajie.ho@xxxxxxxxxxxxxxxx>
    Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/drivers/crypto/starfive/jh7110-cryp.c b/drivers/crypto/starfive/jh7110-cryp.c
index 08e974e0dd12..3a67ddc4d936 100644
--- a/drivers/crypto/starfive/jh7110-cryp.c
+++ b/drivers/crypto/starfive/jh7110-cryp.c
@@ -180,12 +180,8 @@ static int starfive_cryp_probe(struct platform_device *pdev)
 	spin_unlock(&dev_list.lock);
 
 	ret = starfive_dma_init(cryp);
-	if (ret) {
-		if (ret == -EPROBE_DEFER)
-			goto err_probe_defer;
-		else
-			goto err_dma_init;
-	}
+	if (ret)
+		goto err_dma_init;
 
 	/* Initialize crypto engine */
 	cryp->engine = crypto_engine_alloc_init(&pdev->dev, 1);
@@ -233,7 +229,7 @@ static int starfive_cryp_probe(struct platform_device *pdev)
 
 	tasklet_kill(&cryp->aes_done);
 	tasklet_kill(&cryp->hash_done);
-err_probe_defer:
+
 	return ret;
 }
 




[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Index of Archives]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux