diff options
| author | David S. Miller <davem@davemloft.net> | 2019-10-19 22:51:25 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-10-20 10:43:00 -0700 |
| commit | 2f184393e0c2d409c62262f57f2a57efdf9370b8 (patch) | |
| tree | 25b96db2550014d7f888605abfabb67a7f40a5d3 /drivers/net/usb/lan78xx.c | |
| parent | ebcd670d05d54ff8d17a1a51bba1ec1e4069d949 (diff) | |
| parent | 531e93d11470aa2e14e6a3febef50d9bc7bab7a1 (diff) | |
| download | linux-2f184393e0c2d409c62262f57f2a57efdf9370b8.tar.gz linux-2f184393e0c2d409c62262f57f2a57efdf9370b8.tar.bz2 linux-2f184393e0c2d409c62262f57f2a57efdf9370b8.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Several cases of overlapping changes which were for the most
part trivially resolvable.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/usb/lan78xx.c')
| -rw-r--r-- | drivers/net/usb/lan78xx.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c index 58f5a219fb65..62948098191f 100644 --- a/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c @@ -3782,10 +3782,14 @@ static int lan78xx_probe(struct usb_interface *intf, /* driver requires remote-wakeup capability during autosuspend. */ intf->needs_remote_wakeup = 1; + ret = lan78xx_phy_init(dev); + if (ret < 0) + goto out4; + ret = register_netdev(netdev); if (ret != 0) { netif_err(dev, probe, netdev, "couldn't register the device\n"); - goto out4; + goto out5; } usb_set_intfdata(intf, dev); @@ -3798,14 +3802,10 @@ static int lan78xx_probe(struct usb_interface *intf, pm_runtime_set_autosuspend_delay(&udev->dev, DEFAULT_AUTOSUSPEND_DELAY); - ret = lan78xx_phy_init(dev); - if (ret < 0) - goto out5; - return 0; out5: - unregister_netdev(netdev); + phy_disconnect(netdev->phydev); out4: usb_free_urb(dev->urb_intr); out3: |