2 files changed, 15 insertions, 13 deletions

diff --git a/drivers/net/enic/enic.h b/drivers/net/enic/enic.h
index 1385a609ed49..f38ad634989c 100644
--- a/drivers/net/enic/enic.h
+++ b/drivers/net/enic/enic.h
@@ -32,7 +32,7 @@
 
 #define DRV_NAME                "enic"
 #define DRV_DESCRIPTION         "Cisco VIC Ethernet NIC Driver"
-#define DRV_VERSION             "2.1.1.3"
+#define DRV_VERSION             "2.1.1.4"
 #define DRV_COPYRIGHT           "Copyright 2008-2011 Cisco Systems, Inc"
 
 #define ENIC_BARS_MAX           6
diff --git a/drivers/net/enic/enic_dev.c b/drivers/net/enic/enic_dev.c
index a52dbd2b3c63..382626628b1b 100644
--- a/drivers/net/enic/enic_dev.c
+++ b/drivers/net/enic/enic_dev.c
@@ -49,26 +49,28 @@ int enic_dev_stats_dump(struct enic *enic, struct vnic_stats **vstats)
 
 int enic_dev_add_station_addr(struct enic *enic)
 {
-        int err = 0;
+        int err;
+
+        if (!is_valid_ether_addr(enic->netdev->dev_addr))
+                return -EADDRNOTAVAIL;
 
-        if (is_valid_ether_addr(enic->netdev->dev_addr)) {
-                spin_lock(&enic->devcmd_lock);
-                err = vnic_dev_add_addr(enic->vdev, enic->netdev->dev_addr);
-                spin_unlock(&enic->devcmd_lock);
-        }
+        spin_lock(&enic->devcmd_lock);
+        err = vnic_dev_add_addr(enic->vdev, enic->netdev->dev_addr);
+        spin_unlock(&enic->devcmd_lock);
 
         return err;
 }
 
 int enic_dev_del_station_addr(struct enic *enic)
 {
-        int err = 0;
+        int err;
+
+        if (!is_valid_ether_addr(enic->netdev->dev_addr))
+                return -EADDRNOTAVAIL;
 
-        if (is_valid_ether_addr(enic->netdev->dev_addr)) {
-                spin_lock(&enic->devcmd_lock);
-                err = vnic_dev_del_addr(enic->vdev, enic->netdev->dev_addr);
-                spin_unlock(&enic->devcmd_lock);
-        }
+        spin_lock(&enic->devcmd_lock);
+        err = vnic_dev_del_addr(enic->vdev, enic->netdev->dev_addr);
+        spin_unlock(&enic->devcmd_lock);
 
         return err;
 }