| Message ID | 1556098549-18385-1-git-send-email-fabien.dessenne@st.com (mailing list archive) |
|---|---|
| State | Mainlined, archived |
| Commit | 56c5bc1849de1311eda5bc506bddad504bfd14fc |
| Headers | show |
| Series | net: ethernet: stmmac: manage the get_irq probe defer case | expand |
Hi On 4/24/19 11:35 AM, Fabien Dessenne wrote: > Manage the -EPROBE_DEFER error case for "stm32_pwr_wakeup" IRQ. > > Signed-off-by: Fabien Dessenne <fabien.dessenne@st.com> > --- > 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) { > Acked-by: Alexandre TORGUE <alexandre.torgue@st.com>
From: Fabien Dessenne <fabien.dessenne@st.com> Date: Wed, 24 Apr 2019 11:35:49 +0200 > Manage the -EPROBE_DEFER error case for "stm32_pwr_wakeup" IRQ. > > Signed-off-by: Fabien Dessenne <fabien.dessenne@st.com> Applied, thank you.
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) {
Manage the -EPROBE_DEFER error case for "stm32_pwr_wakeup" IRQ. Signed-off-by: Fabien Dessenne <fabien.dessenne@st.com> --- drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c | 3 +++ 1 file changed, 3 insertions(+)