diff options
| author |   David S. Miller <davem@davemloft.net> | 2018-11-28 22:10:54 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-11-28 22:10:54 -0800 |
| commit | e561bb29b650d2817d10a4858f1817836ed08399 (patch) | |
| tree | 0bc92b5bb8a287a8e4a88732f3c64b56d126da58 /drivers/net/phy | |
| parent | net: qualcomm: rmnet: remove set but not used variables 'ip_family, fc_seq, qos_id' (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | linux-dev-e561bb29b650d2817d10a4858f1817836ed08399.tar.xz linux-dev-e561bb29b650d2817d10a4858f1817836ed08399.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Trivial conflict in net/core/filter.c, a locally computed
'sdif' is now an argument to the function.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/phy')
| -rw-r--r-- | drivers/net/phy/phy_device.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index e06613f2d431..0904002b19a2 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -2255,6 +2255,14 @@ int phy_driver_register(struct phy_driver *new_driver, struct module *owner) new_driver->mdiodrv.driver.remove = phy_remove; new_driver->mdiodrv.driver.owner = owner; + /* The following works around an issue where the PHY driver doesn't bind + * to the device, resulting in the genphy driver being used instead of + * the dedicated driver. The root cause of the issue isn't known yet + * and seems to be in the base driver core. Once this is fixed we may + * remove this workaround. + */ + new_driver->mdiodrv.driver.probe_type = PROBE_FORCE_SYNCHRONOUS; + retval = driver_register(&new_driver->mdiodrv.driver); if (retval) { pr_err("%s: Error %d in registering driver\n", |