diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2015-06-05 22:25:01 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2015-06-05 22:25:01 +0200 |
| commit | 9f61f62544747db5d5c590bfae9dd19f1337e421 (patch) | |
| tree | 74772cccd14e7ab6d01a3452d4030cd7f8e58ccb /drivers/net/phy/mdio-gpio.c | |
| parent | de8d1810fda5463ee60ba2937ca68e55a52bd9e7 (diff) | |
| parent | 086e8ddb567951513a5dace21a09297768aee14f (diff) | |
| download | linux-9f61f62544747db5d5c590bfae9dd19f1337e421.tar.bz2 | |
Merge branch 'linus' into irq/core
Get the urgent fixes from upstream to avoid conflicts.
Diffstat (limited to 'drivers/net/phy/mdio-gpio.c')
| -rw-r--r-- | drivers/net/phy/mdio-gpio.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/phy/mdio-gpio.c b/drivers/net/phy/mdio-gpio.c index c9cb486c753d..53d18150f4e2 100644 --- a/drivers/net/phy/mdio-gpio.c +++ b/drivers/net/phy/mdio-gpio.c @@ -168,7 +168,10 @@ static struct mii_bus *mdio_gpio_bus_init(struct device *dev, if (!new_bus->irq[i]) new_bus->irq[i] = PHY_POLL; - snprintf(new_bus->id, MII_BUS_ID_SIZE, "gpio-%x", bus_id); + if (bus_id != -1) + snprintf(new_bus->id, MII_BUS_ID_SIZE, "gpio-%x", bus_id); + else + strncpy(new_bus->id, "gpio", MII_BUS_ID_SIZE); if (devm_gpio_request(dev, bitbang->mdc, "mdc")) goto out_free_bus; |