Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932634AbbD0LBQ (ORCPT ); Mon, 27 Apr 2015 07:01:16 -0400 Received: from bastet.se.axis.com ([195.60.68.11]:44721 "EHLO bastet.se.axis.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751384AbbD0LBO (ORCPT ); Mon, 27 Apr 2015 07:01:14 -0400 From: Niklas Cassel To: CC: , , , , Niklas Cassel Subject: [PATCH] net: phy: micrel: support !CONFIG_HAVE_CLK Date: Mon, 27 Apr 2015 13:00:50 +0200 Message-ID: <1430132450-4496-1-git-send-email-niklass@axis.com> X-Mailer: git-send-email 2.1.4 MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1346 Lines: 45 Since NULL is a valid clock, we shouldn't use IS_ERR_OR_NULL. Implemented as Russell King suggested in: http://lkml.kernel.org/r/20150207172949.GE8656@n2100.arm.linux.org.uk Signed-off-by: Niklas Cassel --- drivers/net/phy/micrel.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c index 1190fd8..d958d13 100644 --- a/drivers/net/phy/micrel.c +++ b/drivers/net/phy/micrel.c @@ -522,6 +522,7 @@ static int kszphy_probe(struct phy_device *phydev) struct device_node *np = phydev->dev.of_node; struct kszphy_priv *priv; struct clk *clk; + unsigned long rate = 0; int ret; priv = devm_kzalloc(&phydev->dev, sizeof(*priv), GFP_KERNEL); @@ -548,8 +549,10 @@ static int kszphy_probe(struct phy_device *phydev) } clk = devm_clk_get(&phydev->dev, "rmii-ref"); - if (!IS_ERR(clk)) { - unsigned long rate = clk_get_rate(clk); + if (!IS_ERR(clk)) + rate = clk_get_rate(clk); + + if (rate) { bool rmii_ref_clk_sel_25_mhz; priv->rmii_ref_clk_sel = type->has_rmii_ref_clk_sel; -- 2.1.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/