diff options
| author | Alban Bedel <alban.bedel@avionic-design.de> | 2017-02-28 18:08:55 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-03-02 12:47:23 -0800 |
| commit | 9aea7779b764a11e357d3c74af6aee3cf90f2045 (patch) | |
| tree | fb4d3c61011d13589a47ce7038658d8c159d98aa | |
| parent | e3330039ea28dc199e3b2da993895ff742a91adf (diff) | |
| download | linux-stable-9aea7779b764a11e357d3c74af6aee3cf90f2045.tar.gz linux-stable-9aea7779b764a11e357d3c74af6aee3cf90f2045.tar.bz2 linux-stable-9aea7779b764a11e357d3c74af6aee3cf90f2045.zip | |
drivers: net: xgene: Fix crash on DT systems
On DT systems the driver require a clock, but the probe just print a
warning and continue, leading to a crash when resetting the device.
To fix this crash and properly handle probe deferals only ignore the
missing clock if DT isn't used or if the clock doesn't exist.
Signed-off-by: Alban Bedel <alban.bedel@avionic-design.de>
Acked-by: Iyappan Subramanian <isubramanian@apm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c index e536301acfde..b3568c453b14 100644 --- a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c +++ b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c @@ -1749,6 +1749,12 @@ static int xgene_enet_get_resources(struct xgene_enet_pdata *pdata) pdata->clk = devm_clk_get(&pdev->dev, NULL); if (IS_ERR(pdata->clk)) { + /* Abort if the clock is defined but couldn't be retrived. + * Always abort if the clock is missing on DT system as + * the driver can't cope with this case. + */ + if (PTR_ERR(pdata->clk) != -ENOENT || dev->of_node) + return PTR_ERR(pdata->clk); /* Firmware may have set up the clock already. */ dev_info(dev, "clocks have been setup already\n"); } |