kernel: bump 4.9 to 4.9.164

Refreshed all patches.

Compile-tested on: ar7
Runtime-tested on: none

Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
This commit is contained in:
Koen Vandeputte
2019-03-20 13:27:16 +01:00
parent 9c63141025
commit fa91a147bb
4 changed files with 10 additions and 10 deletions

View File

@@ -87,7 +87,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
if (NULL == bus || NULL == bus->name ||
NULL == bus->read || NULL == bus->write)
@@ -330,6 +334,35 @@ int __mdiobus_register(struct mii_bus *b
@@ -329,6 +333,35 @@ int __mdiobus_register(struct mii_bus *b
if (bus->reset)
bus->reset(bus);
@@ -123,7 +123,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
for (i = 0; i < PHY_MAX_ADDR; i++) {
if ((bus->phy_mask & (1 << i)) == 0) {
struct phy_device *phydev;
@@ -355,6 +388,13 @@ error:
@@ -354,6 +387,13 @@ error:
mdiodev->device_remove(mdiodev);
mdiodev->device_free(mdiodev);
}
@@ -137,7 +137,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
device_del(&bus->dev);
return err;
}
@@ -376,6 +416,13 @@ void mdiobus_unregister(struct mii_bus *
@@ -375,6 +415,13 @@ void mdiobus_unregister(struct mii_bus *
mdiodev->device_remove(mdiodev);
mdiodev->device_free(mdiodev);
}

View File

@@ -21,7 +21,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
--- a/drivers/net/phy/mdio_bus.c
+++ b/drivers/net/phy/mdio_bus.c
@@ -331,9 +331,6 @@ int __mdiobus_register(struct mii_bus *b
@@ -330,9 +330,6 @@ int __mdiobus_register(struct mii_bus *b
mutex_init(&bus->mdio_lock);
@@ -31,7 +31,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
/* de-assert bus level PHY GPIO resets */
if (bus->num_reset_gpios > 0) {
bus->reset_gpiod = devm_kcalloc(&bus->dev,
@@ -363,6 +360,9 @@ int __mdiobus_register(struct mii_bus *b
@@ -362,6 +359,9 @@ int __mdiobus_register(struct mii_bus *b
}
}