Skip to content

Commit

Permalink
ixgbe: Fix ixgbe_write_mbx error result
Browse files Browse the repository at this point in the history
If ixgbe_write_mbx is called and no mbx->ops.write method
exists, no error code is returned. The corresponding read
function explicitly returns an error in such a case as do
other functions, so this appears to be a minor bug. Fix
it for consistency, and generate return values directly
to make things clearer.

Signed-off-by: Mark Rustad <mark.d.rustad@intel.com>
Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
  • Loading branch information
Mark Rustad authored and Jeff Kirsher committed Jul 26, 2014
1 parent acb1ce2 commit 4e86281
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.c
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*******************************************************************************
Intel 10 Gigabit PCI Express Linux driver
Copyright(c) 1999 - 2013 Intel Corporation.
Copyright(c) 1999 - 2014 Intel Corporation.
This program is free software; you can redistribute it and/or modify it
under the terms and conditions of the GNU General Public License,
Expand Down Expand Up @@ -67,15 +67,14 @@ s32 ixgbe_read_mbx(struct ixgbe_hw *hw, u32 *msg, u16 size, u16 mbx_id)
s32 ixgbe_write_mbx(struct ixgbe_hw *hw, u32 *msg, u16 size, u16 mbx_id)
{
struct ixgbe_mbx_info *mbx = &hw->mbx;
s32 ret_val = 0;

if (size > mbx->size)
ret_val = IXGBE_ERR_MBX;
return IXGBE_ERR_MBX;

else if (mbx->ops.write)
ret_val = mbx->ops.write(hw, msg, size, mbx_id);
if (!mbx->ops.write)
return IXGBE_ERR_MBX;

return ret_val;
return mbx->ops.write(hw, msg, size, mbx_id);
}

/**
Expand Down

0 comments on commit 4e86281

Please sign in to comment.