From: Niklas Cassel Date: Tue, 12 May 2015 07:43:14 +0000 (+0200) Subject: net: phy: micrel: Fix regression in kszphy_probe X-Git-Tag: omap-for-v4.2/wakeirq-drivers~2^2~30^2~2 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bced870152161435cc59a53e77f3699f8e8f22ca;p=pandora-kernel.git net: phy: micrel: Fix regression in kszphy_probe 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.18+ Fixes: 1fadee0c3645 ("net/phy: micrel: Add clock support for KSZ8021/KSZ8031") Reviewed-by: Fabio Estevam Reviewed-by: Johan Hovold Signed-off-by: Niklas Cassel Signed-off-by: David S. Miller --- Reading git-diff-tree failed