diff options
| author | Hauke Mehrtens <hauke@openwrt.org> | 2014-10-27 22:55:39 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@openwrt.org> | 2014-10-27 22:55:39 +0000 |
| commit | 2644af4717cf9cc3cf89564ca017f596a7dcad05 (patch) | |
| tree | 7f2121f700446e60159a365094fdc6eea16d5cb7 /target/linux/generic/patches-3.18/703-phy-add-detach-callback-to-struct-phy_driver.patch | |
| parent | 5e558fcd48c8c4acb87fe7bcf3eb2a66bb279503 (diff) | |
| download | master-187ad058-2644af4717cf9cc3cf89564ca017f596a7dcad05.tar.gz master-187ad058-2644af4717cf9cc3cf89564ca017f596a7dcad05.tar.bz2 master-187ad058-2644af4717cf9cc3cf89564ca017f596a7dcad05.zip | |
kernel: make the kernel 3.18 patches apply and boot on arm.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43095 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.18/703-phy-add-detach-callback-to-struct-phy_driver.patch')
| -rw-r--r-- | target/linux/generic/patches-3.18/703-phy-add-detach-callback-to-struct-phy_driver.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/generic/patches-3.18/703-phy-add-detach-callback-to-struct-phy_driver.patch b/target/linux/generic/patches-3.18/703-phy-add-detach-callback-to-struct-phy_driver.patch index f4750bd56e..061e40fb49 100644 --- a/target/linux/generic/patches-3.18/703-phy-add-detach-callback-to-struct-phy_driver.patch +++ b/target/linux/generic/patches-3.18/703-phy-add-detach-callback-to-struct-phy_driver.patch @@ -1,18 +1,18 @@ --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c -@@ -662,6 +662,9 @@ EXPORT_SYMBOL(phy_attach); - void phy_detach(struct phy_device *phydev) +@@ -674,6 +674,9 @@ void phy_detach(struct phy_device *phyde { int i; + + if (phydev->drv && phydev->drv->detach) + phydev->drv->detach(phydev); + - phydev->attached_dev->phydev = NULL; - phydev->attached_dev = NULL; - phy_suspend(phydev); + if (phydev->bus->dev.driver) + module_put(phydev->bus->dev.driver->owner); + --- a/include/linux/phy.h +++ b/include/linux/phy.h -@@ -441,6 +441,12 @@ struct phy_driver { +@@ -502,6 +502,12 @@ struct phy_driver { */ int (*did_interrupt)(struct phy_device *phydev); |