diff --git a/[refs] b/[refs] index ee955086a4c5..386580eb9407 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f148f61d89995660e8aa20a2784ecd9c7f25e2a6 +refs/heads/master: be35ae9e08dbbc70f1cd50de8639627fa501692d diff --git a/trunk/drivers/net/ibmveth.c b/trunk/drivers/net/ibmveth.c index 8adfff55792d..11086dbe76e8 100644 --- a/trunk/drivers/net/ibmveth.c +++ b/trunk/drivers/net/ibmveth.c @@ -1392,7 +1392,7 @@ static int __devinit ibmveth_probe(struct vio_dev *dev, NULL); if (!mac_addr_p) { dev_err(&dev->dev, "Can't find VETH_MAC_ADDR attribute\n"); - return 0; + return -EINVAL; } mcastFilterSize_p = (unsigned int *)vio_get_attribute(dev, @@ -1400,7 +1400,7 @@ static int __devinit ibmveth_probe(struct vio_dev *dev, if (!mcastFilterSize_p) { dev_err(&dev->dev, "Can't find VETH_MCAST_FILTER_SIZE " "attribute\n"); - return 0; + return -EINVAL; } netdev = alloc_etherdev(sizeof(struct ibmveth_adapter));