Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts:
	drivers/infiniband/hw/nes/nes_cm.c

Simple whitespace conflict.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 4 insertions, 6 deletions

diff --git a/drivers/net/ethernet/brocade/bna/bnad_ethtool.c b/drivers/net/ethernet/brocade/bna/bnad_ethtool.c
index a27c601af3d1..ab753d7334a6 100644
--- a/drivers/net/ethernet/brocade/bna/bnad_ethtool.c
+++ b/drivers/net/ethernet/brocade/bna/bnad_ethtool.c
@@ -946,7 +946,7 @@ bnad_get_flash_partition_by_offset(struct bnad *bnad, u32 offset,
 
         flash_attr = kzalloc(sizeof(struct bfa_flash_attr), GFP_KERNEL);
         if (!flash_attr)
-                return -ENOMEM;
+                return 0;
 
         fcomp.bnad = bnad;
         fcomp.comp_status = 0;
@@ -958,7 +958,7 @@ bnad_get_flash_partition_by_offset(struct bnad *bnad, u32 offset,
         if (ret != BFA_STATUS_OK) {
                 spin_unlock_irqrestore(&bnad->bna_lock, flags);
                 kfree(flash_attr);
-                goto out_err;
+                return 0;
         }
         spin_unlock_irqrestore(&bnad->bna_lock, flags);
         wait_for_completion(&fcomp.comp);
@@ -978,8 +978,6 @@ bnad_get_flash_partition_by_offset(struct bnad *bnad, u32 offset,
         }
         kfree(flash_attr);
         return flash_part;
-out_err:
-        return -EINVAL;
 }
 
 static int
@@ -1006,7 +1004,7 @@ bnad_get_eeprom(struct net_device *netdev, struct ethtool_eeprom *eeprom,
         /* Query the flash partition based on the offset */
         flash_part = bnad_get_flash_partition_by_offset(bnad,
                                 eeprom->offset, &base_offset);
-        if (flash_part <= 0)
+        if (flash_part == 0)
                 return -EFAULT;
 
         fcomp.bnad = bnad;
@@ -1048,7 +1046,7 @@ bnad_set_eeprom(struct net_device *netdev, struct ethtool_eeprom *eeprom,
         /* Query the flash partition based on the offset */
         flash_part = bnad_get_flash_partition_by_offset(bnad,
                                 eeprom->offset, &base_offset);
-        if (flash_part <= 0)
+        if (flash_part == 0)
                 return -EFAULT;
 
         fcomp.bnad = bnad;