Merge branch 'bnx2x-fixes'
authorDavid S. Miller <davem@davemloft.net>
Mon, 10 Aug 2015 21:31:59 +0000 (14:31 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 10 Aug 2015 21:31:59 +0000 (14:31 -0700)
Yuval Mintz says:

====================
bnx2x: small fixes

This adds 2 small fixes, one to error flows during memory release
and the other to flash writes via ethtool API.
====================

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

Trivial merge