diff options
| author | Bert Vermeulen | 2015-05-08 16:18:49 +0200 |
|---|---|---|
| committer | David S. Miller | 2015-05-11 01:42:11 +0200 |
| commit | 7c0c82682873354490a5b67c77331bd65a356236 (patch) | |
| tree | 73da8142fabb0062940986b7ccc4cae2f1903c85 /drivers/net/phy | |
| parent | af_packet / TX_RING not fully non-blocking (w/ MSG_DONTWAIT). (diff) | |
| download | kernel-qcow2-linux-7c0c82682873354490a5b67c77331bd65a356236.tar.gz kernel-qcow2-linux-7c0c82682873354490a5b67c77331bd65a356236.tar.xz kernel-qcow2-linux-7c0c82682873354490a5b67c77331bd65a356236.zip | |
net: mdio-gpio: Allow for unspecified bus id
When the bus id was supplied via a struct platform_device, the driver wasn't
handling -1 to mean an unspecified id of the only instance of this driver,
as the platform spec requires.
Signed-off-by: Bert Vermeulen <bert@biot.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/phy')
| -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; |