diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2018-04-23 16:07:15 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2018-04-23 16:07:15 -0700 |
| commit | 57eb13a9e8f5d45a95d64da2174528666240031d (patch) | |
| tree | 71aa69d108c3050a132c1181cb9b4a9eb69ac04e /drivers/net/macsec.c | |
| parent | 04bb1719c4de94700056241d4c0fe3c1413f5aff (diff) | |
| parent | 96a938aa214e965d5b4a2f10443b29cad14289b9 (diff) | |
Merge branch 'ib-chrome-platform-input-atmel-mx-ts-platform-removal' of git://git.kernel.org/pub/scm/linux/kernel/git/bleung/chrome-platform into next
Sync up with chrome-platform to bring in changes to Atmel touch
controller.
Diffstat (limited to 'drivers/net/macsec.c')
| -rw-r--r-- | drivers/net/macsec.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/macsec.c b/drivers/net/macsec.c index 7de88b33d5b9..9cbb0c8a896a 100644 --- a/drivers/net/macsec.c +++ b/drivers/net/macsec.c @@ -3277,7 +3277,7 @@ static int macsec_newlink(struct net *net, struct net_device *dev, err = netdev_upper_dev_link(real_dev, dev, extack); if (err < 0) - goto unregister; + goto put_dev; /* need to be already registered so that ->init has run and * the MAC addr is set @@ -3316,7 +3316,8 @@ del_dev: macsec_del_dev(macsec); unlink: netdev_upper_dev_unlink(real_dev, dev); -unregister: +put_dev: + dev_put(real_dev); unregister_netdevice(dev); return err; } |