| Message ID | 20200925095406.27834-1-vee.khee.wong@intel.com |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | [net,1/1] net: stmmac: Fix clock handling on remove path | expand |
On Fri, Sep 25, 2020 at 12:54 PM Wong Vee Khee <vee.khee.wong@intel.com> wrote: > > While unloading the dwmac-intel driver, clk_disable_unprepare() is > being called twice in stmmac_dvr_remove() and > intel_eth_pci_remove(). This causes kernel panic on the second call. > > Removing the second call of clk_disable_unprepare() in > intel_eth_pci_remove(). Thanks! I'm not sure how I missed this... Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com> > Fixes: 09f012e64e4b ("stmmac: intel: Fix clock handling on error and remove paths") > Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > Reviewed-by: Voon Weifeng <weifeng.voon@intel.com> > Signed-off-by: Wong Vee Khee <vee.khee.wong@intel.com> > --- > drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c > index 2ac9dfb3462c..9e6d60e75f85 100644 > --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c > +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c > @@ -653,7 +653,6 @@ static void intel_eth_pci_remove(struct pci_dev *pdev) > > pci_free_irq_vectors(pdev); > > - clk_disable_unprepare(priv->plat->stmmac_clk); > clk_unregister_fixed_rate(priv->plat->stmmac_clk); > > pcim_iounmap_regions(pdev, BIT(0)); > -- > 2.17.0 >
From: Wong Vee Khee <vee.khee.wong@intel.com> Date: Fri, 25 Sep 2020 17:54:06 +0800 > While unloading the dwmac-intel driver, clk_disable_unprepare() is > being called twice in stmmac_dvr_remove() and > intel_eth_pci_remove(). This causes kernel panic on the second call. > > Removing the second call of clk_disable_unprepare() in > intel_eth_pci_remove(). > > Fixes: 09f012e64e4b ("stmmac: intel: Fix clock handling on error and remove paths") > Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > Reviewed-by: Voon Weifeng <weifeng.voon@intel.com> > Signed-off-by: Wong Vee Khee <vee.khee.wong@intel.com> Applied, thanks.
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c index 2ac9dfb3462c..9e6d60e75f85 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c @@ -653,7 +653,6 @@ static void intel_eth_pci_remove(struct pci_dev *pdev) pci_free_irq_vectors(pdev); - clk_disable_unprepare(priv->plat->stmmac_clk); clk_unregister_fixed_rate(priv->plat->stmmac_clk); pcim_iounmap_regions(pdev, BIT(0));
While unloading the dwmac-intel driver, clk_disable_unprepare() is being called twice in stmmac_dvr_remove() and intel_eth_pci_remove(). This causes kernel panic on the second call. Removing the second call of clk_disable_unprepare() in intel_eth_pci_remove(). Fixes: 09f012e64e4b ("stmmac: intel: Fix clock handling on error and remove paths") Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Reviewed-by: Voon Weifeng <weifeng.voon@intel.com> Signed-off-by: Wong Vee Khee <vee.khee.wong@intel.com> --- drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c | 1 - 1 file changed, 1 deletion(-)