diff --git a/[refs] b/[refs] index 560af36055dd..35db6b7be379 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 07f623d3b278abe88508c1c59d7c1089b4a56789 +refs/heads/master: 5bd30d398792eb6351da2087fe81bbf755900991 diff --git a/trunk/net/core/netpoll.c b/trunk/net/core/netpoll.c index a5ad1c1c4b18..a9b10048388a 100644 --- a/trunk/net/core/netpoll.c +++ b/trunk/net/core/netpoll.c @@ -1056,6 +1056,7 @@ int netpoll_setup(struct netpoll *np) err = -ENODEV; goto unlock; } + dev_hold(ndev); if (netdev_master_upper_dev_get(ndev)) { np_err(np, "%s is a slave device, aborting\n", np->dev_name);