diff options
author | Guenter Roeck <linux@roeck-us.net> | 2015-08-17 13:45:36 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-08-17 14:06:16 -0700 |
commit | 62ee783bf1f872ba879e088a669b04afebee899b (patch) | |
tree | 98fcd45c8e6c0e382f7a6961f9c8808994a1484a /drivers/net/ethernet/smsc | |
parent | c87acb2558db7a870575dd8e14ded2e5acbdc295 (diff) | |
download | linux-stable-62ee783bf1f872ba879e088a669b04afebee899b.tar.gz linux-stable-62ee783bf1f872ba879e088a669b04afebee899b.tar.bz2 linux-stable-62ee783bf1f872ba879e088a669b04afebee899b.zip |
smsc911x: Fix crash seen if neither ACPI nor OF is configured or used
Commit 0b50dc4fc971 ("Convert smsc911x to use ACPI as well as DT") makes
the call to smsc911x_probe_config() unconditional, and no longer fails if
there is no device node. device_get_phy_mode() is called unconditionally,
and if there is no phy node configured returns an error code. This error
code is assigned to phy_interface, and interpreted elsewhere in the code
as valid phy mode. This in turn causes qemu to crash when running a
variant of realview_pb_defconfig.
qemu: hardware error: lan9118_read: Bad reg 0x86
Fixes: 0b50dc4fc971 ("Convert smsc911x to use ACPI as well as DT")
Cc: Jeremy Linton <jeremy.linton@arm.com>
Cc Graeme Gregory <graeme.gregory@linaro.org>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/smsc')
-rw-r--r-- | drivers/net/ethernet/smsc/smsc911x.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/net/ethernet/smsc/smsc911x.c b/drivers/net/ethernet/smsc/smsc911x.c index 0f21aa3bb537..34f97684506b 100644 --- a/drivers/net/ethernet/smsc/smsc911x.c +++ b/drivers/net/ethernet/smsc/smsc911x.c @@ -2367,12 +2367,17 @@ static const struct smsc911x_ops shifted_smsc911x_ops = { static int smsc911x_probe_config(struct smsc911x_platform_config *config, struct device *dev) { + int phy_interface; u32 width = 0; if (!dev) return -ENODEV; - config->phy_interface = device_get_phy_mode(dev); + phy_interface = device_get_phy_mode(dev); + if (phy_interface < 0) + return phy_interface; + + config->phy_interface = phy_interface; device_get_mac_address(dev, config->mac, ETH_ALEN); |