net: ethernet: stmmac: manage the get_irq probe defer case [Linux 5.1]

net: ethernet: stmmac: manage the get_irq probe defer case [Linux 5.1]

This Linux kernel change "net: ethernet: stmmac: manage the get_irq probe defer case" is included in the Linux 5.1 release. This change is authored by Fabien Dessenne <fabien.dessenne [at] st.com> on Wed Apr 24 11:35:49 2019 +0200. The commit for this change in Linux stable tree is 56c5bc1 (patch).

net: ethernet: stmmac: manage the get_irq probe defer case

Manage the -EPROBE_DEFER error case for "stm32_pwr_wakeup"  IRQ.

Signed-off-by: Fabien Dessenne <[email protected]>
Acked-by: Alexandre TORGUE <[email protected]>
Signed-off-by: David S. Miller <[email protected]>

There are 3 lines of Linux source code added/deleted in this change. Code changes to Linux kernel are as follows.

 drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c
index 062a600f..2142853 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c
@@ -333,6 +333,9 @@ static int stm32mp1_parse_data(struct stm32_dwmac *dwmac,
     */
    dwmac->irq_pwr_wakeup = platform_get_irq_byname(pdev,
                            "stm32_pwr_wakeup");
+   if (dwmac->irq_pwr_wakeup == -EPROBE_DEFER)
+       return -EPROBE_DEFER;
+
    if (!dwmac->clk_eth_ck && dwmac->irq_pwr_wakeup >= 0) {
        err = device_init_wakeup(&pdev->dev, true);
        if (err) {

Leave a Reply

Your email address will not be published. Required fields are marked *