OSDN Git Service

crypto: stm32/hash - defer probe for reset controller
authorEtienne Carriere <etienne.carriere@st.com>
Mon, 27 Apr 2020 06:42:24 +0000 (08:42 +0200)
committerHerbert Xu <herbert@gondor.apana.org.au>
Fri, 8 May 2020 05:30:39 +0000 (15:30 +1000)
Change stm32 HASH driver to defer its probe operation when
reset controller device is registered but has not been probed yet.

Signed-off-by: Etienne Carriere <etienne.carriere@st.com>
Reviewed-by: Lionel DEBIEVE <lionel.debieve@st.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
drivers/crypto/stm32/stm32-hash.c

index 167b80e..fad6190 100644 (file)
@@ -1482,7 +1482,12 @@ static int stm32_hash_probe(struct platform_device *pdev)
        pm_runtime_enable(dev);
 
        hdev->rst = devm_reset_control_get(&pdev->dev, NULL);
-       if (!IS_ERR(hdev->rst)) {
+       if (IS_ERR(hdev->rst)) {
+               if (PTR_ERR(hdev->rst) == -EPROBE_DEFER) {
+                       ret = -EPROBE_DEFER;
+                       goto err_reset;
+               }
+       } else {
                reset_control_assert(hdev->rst);
                udelay(2);
                reset_control_deassert(hdev->rst);
@@ -1535,7 +1540,7 @@ err_engine:
 
        if (hdev->dma_lch)
                dma_release_channel(hdev->dma_lch);
-
+err_reset:
        pm_runtime_disable(dev);
        pm_runtime_put_noidle(dev);