diff --git a/[refs] b/[refs] index 869c30aa4dfa..4e7f0761c137 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b06efc199f9b8cc49e47d441f837a2dbe4971e4e +refs/heads/master: 51a805d0ce0f78810fd90d4e9eafd8a0ab4bdb58 diff --git a/trunk/drivers/staging/hv/netvsc_drv.c b/trunk/drivers/staging/hv/netvsc_drv.c index 0b8ac1abe1a7..90a3198c9978 100644 --- a/trunk/drivers/staging/hv/netvsc_drv.c +++ b/trunk/drivers/staging/hv/netvsc_drv.c @@ -338,7 +338,7 @@ static int netvsc_probe(struct hv_device *dev) net = alloc_etherdev(sizeof(struct net_device_context)); if (!net) - return -1; + return -ENOMEM; /* Set initial state */ netif_carrier_off(net);