From 2e5d5d2b070278e3e00f11e59e676827a9a12064 Mon Sep 17 00:00:00 2001
From: Santiago Leon <santil@linux.vnet.ibm.com>
Date: Fri, 3 Sep 2010 18:29:36 +0000
Subject: [PATCH] --- yaml --- r: 214319 b: refs/heads/master c:
 be35ae9e08dbbc70f1cd50de8639627fa501692d h: refs/heads/master i:   214317:
 42cf946a8c0aa8cba08d1d5871cefc652d2801b9   214315:
 373f4266c4ebea31de1153faab082826104badaf   214311:
 954a6ac60556ed152f12fc5a21812f56e301ed3d   214303:
 77b472a0d1d7a039ea2c522bfa8be65d10490fba v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/net/ibmveth.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

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));