Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750962AbbEKNay (ORCPT ); Mon, 11 May 2015 09:30:54 -0400 Received: from bastet.se.axis.com ([195.60.68.11]:56694 "EHLO bastet.se.axis.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752211AbbEKNaw (ORCPT ); Mon, 11 May 2015 09:30:52 -0400 From: Niklas Cassel To: CC: , , , , , Niklas Cassel , stable Subject: [PATCH v3] net: phy: micrel: Fix regression in kszphy_probe Date: Mon, 11 May 2015 15:30:15 +0200 Message-ID: <1431351015-21956-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: 1502 Lines: 43 Don't do clock-mode-select if clk == NULL, since when building without CONFIG_HAVE_CLK, clk_get returns NULL and clk_get_rate returns 0. Doing clock-mode-select in this cause causes kszphy_probe to return -EINVAL and thus prevents the device from being probed. The original code (before regression) would return 0 when building without CONFIG_HAVE_CLK. Cc: stable # 3.19+ Fixes: 63f44b2bfccd ("net: phy: micrel: add generic clock-mode-select support") Signed-off-by: Niklas Cassel --- drivers/net/phy/micrel.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c index 1190fd8..f6a34e3 100644 --- a/drivers/net/phy/micrel.c +++ b/drivers/net/phy/micrel.c @@ -548,7 +548,11 @@ static int kszphy_probe(struct phy_device *phydev) } clk = devm_clk_get(&phydev->dev, "rmii-ref"); - if (!IS_ERR(clk)) { + /* Don't check rate if clk == NULL, since when CONFIG_HAVE_CLK is not + * set, clk_get returns NULL and clk_get_rate returns 0. Doing so + * would return -EINVAL and prevent the device from being probed. + */ + if (!IS_ERR_OR_NULL(clk)) { unsigned long rate = clk_get_rate(clk); bool rmii_ref_clk_sel_25_mhz; -- 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/