diff options
| author | Suman Tripathi | 2015-06-23 11:17:17 +0200 |
|---|---|---|
| committer | David S. Miller | 2015-06-23 16:19:21 +0200 |
| commit | c2d33bdc66e3b7db574e6b4864225cb341bffbcd (patch) | |
| tree | 2831ea538e4b73fcae941506fb3a17de24df020a /drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.c | |
| parent | drivers: net: xgene: Add ACPI support for SGMII0 and XFI1 interface of 2nd H/... (diff) | |
| download | kernel-qcow2-linux-c2d33bdc66e3b7db574e6b4864225cb341bffbcd.tar.gz kernel-qcow2-linux-c2d33bdc66e3b7db574e6b4864225cb341bffbcd.tar.xz kernel-qcow2-linux-c2d33bdc66e3b7db574e6b4864225cb341bffbcd.zip | |
drivers: net: xgene: Check for IS_ERR rather than NULL for clock.
This patches fixes the code to check for IS_ERR rather
than NULL for clock interface.
Signed-off-by: Iyappan Subramanian <isubramanian@apm.com>
Signed-off-by: Suman Tripathi <stripathi@apm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.c')
| -rw-r--r-- | drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.c b/drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.c index ff240b3cb2b8..05b817e56fde 100644 --- a/drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.c +++ b/drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.c @@ -334,9 +334,11 @@ static int xgene_enet_reset(struct xgene_enet_pdata *p) if (!xgene_ring_mgr_init(p)) return -ENODEV; - clk_prepare_enable(p->clk); - clk_disable_unprepare(p->clk); - clk_prepare_enable(p->clk); + if (!IS_ERR(p->clk)) { + clk_prepare_enable(p->clk); + clk_disable_unprepare(p->clk); + clk_prepare_enable(p->clk); + } xgene_enet_ecc_init(p); xgene_enet_config_ring_if_assoc(p); @@ -369,7 +371,8 @@ static void xgene_enet_cle_bypass(struct xgene_enet_pdata *p, static void xgene_enet_shutdown(struct xgene_enet_pdata *p) { - clk_disable_unprepare(p->clk); + if (!IS_ERR(p->clk)) + clk_disable_unprepare(p->clk); } static void xgene_enet_link_state(struct work_struct *work) |