]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
net: stmmac: fix stmmac_pci_probe failed when CONFIG_HAVE_CLK is selected
authorKweh, Hock Leong <hock.leong.kweh@intel.com>
Fri, 26 Sep 2014 13:42:55 +0000 (21:42 +0800)
committerDavid S. Miller <davem@davemloft.net>
Mon, 29 Sep 2014 20:36:58 +0000 (16:36 -0400)
commitc5bb86c3848174aad59ea6cf5748e210fbb8f744
treefab586db24a1c1c5761b72ea716c15c782d2a37d
parent17c9c8232663a47f074b7452b9b034efda868ca7
net: stmmac: fix stmmac_pci_probe failed when CONFIG_HAVE_CLK is selected

When the CONFIG_HAVE_CLK is selected for the system, the stmmac_pci_probe
will fail with dmesg:
[    2.167225] stmmaceth 0000:00:14.6: enabling device (0000 -> 0002)
[    2.178267] stmmaceth 0000:00:14.6: enabling bus mastering
[    2.178436] stmmaceth 0000:00:14.6: irq 24 for MSI/MSI-X
[    2.178703] stmmaceth 0000:00:14.6: stmmac_dvr_probe: warning: cannot
get CSR clock
[    2.186503] stmmac_pci_probe: main driver probe failed
[    2.194003] stmmaceth 0000:00:14.6: disabling bus mastering
[    2.196473] stmmaceth: probe of 0000:00:14.6 failed with error -2

This patch fix the issue by breaking the dependency to devm_clk_get()
as the CSR clock can be obtained at priv->plat->clk_csr from pci driver.

Reported-by: Tobias Klausmann <tobias.johannes.klausmann@mni.thm.de>
Signed-off-by: Kweh, Hock Leong <hock.leong.kweh@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c