renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-25 05:34:00 +08:00
Code

smsc911x: Ignore error return from device_get_phy_mode()

Browse Source 
Commit 62ee783bf1 ("smsc911x: Fix crash seen if neither ACPI nor OF is
configured or used") introduces an error check for the return value from
device_get_phy_mode() and bails out if there is an error. Unfortunately,
there are configurations where no phy is configured. Those configurations
now fail.

To fix the problem, accept error returns from device_get_phy_mode(),
and use the return value from device_property_read_u32() to determine
if there is a suitable firmware interface to read the configuration.

Fixes: 62ee783bf1 ("smsc911x: Fix crash seen if neither ACPI nor OF is configured or used")
Tested-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Guenter Roeck 2015-08-26 20:27:05 -07:00 committed by David S. Miller
parent 4fa7508e9f
commit 31cb5c9e69
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/net/ethernet/smsc/smsc911x.c
View File

@ -2369,23 +2369,25 @@ static int smsc911x_probe_config(struct smsc911x_platform_config *config,
{ {
int phy_interface; int phy_interface;
u32 width = 0; u32 width = 0;
int err;
phy_interface = device_get_phy_mode(dev); phy_interface = device_get_phy_mode(dev);
if (phy_interface < 0) if (phy_interface < 0)
return phy_interface; phy_interface = PHY_INTERFACE_MODE_NA;
config->phy_interface = phy_interface; config->phy_interface = phy_interface;
device_get_mac_address(dev, config->mac, ETH_ALEN); device_get_mac_address(dev, config->mac, ETH_ALEN);
device_property_read_u32(dev, "reg-shift", &config->shift); err = device_property_read_u32(dev, "reg-io-width", &width);
if (err == -ENXIO)
device_property_read_u32(dev, "reg-io-width", &width); return err;
if (width == 4) if (!err && width == 4)
config->flags |= SMSC911X_USE_32BIT; config->flags |= SMSC911X_USE_32BIT;
else else
config->flags |= SMSC911X_USE_16BIT; config->flags |= SMSC911X_USE_16BIT;
device_property_read_u32(dev, "reg-shift", &config->shift);
if (device_property_present(dev, "smsc,irq-active-high")) if (device_property_present(dev, "smsc,irq-active-high"))
config->irq_polarity = SMSC911X_IRQ_POLARITY_ACTIVE_HIGH; config->irq_polarity = SMSC911X_IRQ_POLARITY_ACTIVE_HIGH;