diff options
| author | David S. Miller <davem@davemloft.net> | 2011-02-08 20:19:01 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-02-08 20:19:01 -0500 |
| commit | 263fb5b1bf9265d0e4ce59ff6ea92f478b5b61ea (patch) | |
| tree | 5ee497d530185d32421122729af86cf77d0dc649 /drivers/net/benet | |
| parent | 8d13a2a9fb3e5e3f68e9d3ec0de3c8fcfa56a224 (diff) | |
| parent | c69b90920a36b88ab0d649963d81355d865eeb05 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/e1000e/netdev.c
Diffstat (limited to 'drivers/net/benet')
| -rw-r--r-- | drivers/net/benet/be_cmds.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/benet/be_cmds.c b/drivers/net/benet/be_cmds.c index 0c7811faf72c..a179cc6d79f2 100644 --- a/drivers/net/benet/be_cmds.c +++ b/drivers/net/benet/be_cmds.c | |||
| @@ -1786,6 +1786,10 @@ int be_cmd_get_seeprom_data(struct be_adapter *adapter, | |||
| 1786 | spin_lock_bh(&adapter->mcc_lock); | 1786 | spin_lock_bh(&adapter->mcc_lock); |
| 1787 | 1787 | ||
| 1788 | wrb = wrb_from_mccq(adapter); | 1788 | wrb = wrb_from_mccq(adapter); |
| 1789 | if (!wrb) { | ||
| 1790 | status = -EBUSY; | ||
| 1791 | goto err; | ||
| 1792 | } | ||
| 1789 | req = nonemb_cmd->va; | 1793 | req = nonemb_cmd->va; |
| 1790 | sge = nonembedded_sgl(wrb); | 1794 | sge = nonembedded_sgl(wrb); |
| 1791 | 1795 | ||
| @@ -1801,6 +1805,7 @@ int be_cmd_get_seeprom_data(struct be_adapter *adapter, | |||
| 1801 | 1805 | ||
| 1802 | status = be_mcc_notify_wait(adapter); | 1806 | status = be_mcc_notify_wait(adapter); |
| 1803 | 1807 | ||
| 1808 | err: | ||
| 1804 | spin_unlock_bh(&adapter->mcc_lock); | 1809 | spin_unlock_bh(&adapter->mcc_lock); |
| 1805 | return status; | 1810 | return status; |
| 1806 | } | 1811 | } |