diff --git a/[refs] b/[refs] index 5f56d53203e8..9f7afb8f93c1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a2f46ee1ba5ee249ce2ca1ee7a7a0ac46529fb4f +refs/heads/master: 21edbb223ed2af88b090e7945af7d91d672e3aa6 diff --git a/trunk/net/core/netpoll.c b/trunk/net/core/netpoll.c index 7aa697253765..d4ec38fa64e6 100644 --- a/trunk/net/core/netpoll.c +++ b/trunk/net/core/netpoll.c @@ -735,7 +735,7 @@ int netpoll_setup(struct netpoll *np) npinfo = kmalloc(sizeof(*npinfo), GFP_KERNEL); if (!npinfo) { err = -ENOMEM; - goto release; + goto put; } npinfo->rx_flags = 0; @@ -845,7 +845,7 @@ int netpoll_setup(struct netpoll *np) kfree(npinfo); } - +put: dev_put(ndev); return err; }