diff options
| author | Amit Kumar Salecha <amit.salecha@qlogic.com> | 2010-04-22 02:51:39 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-22 15:28:29 -0700 |
| commit | ade91f8ec92da43b62b0efaa854cfd4b5ec0c0c9 (patch) | |
| tree | 7d436d941994802743504a8d4acb4facc70f2904 | |
| parent | 6d2a47241f0f780819c111eaabaae0e86a937a40 (diff) | |
| download | linux-3.10-ade91f8ec92da43b62b0efaa854cfd4b5ec0c0c9.tar.gz linux-3.10-ade91f8ec92da43b62b0efaa854cfd4b5ec0c0c9.tar.bz2 linux-3.10-ade91f8ec92da43b62b0efaa854cfd4b5ec0c0c9.zip | |
qlcnic: fix pci semaphore checks
Driver should not go ahead with fw recovery if fails to acquire
semaphore.
Signed-off-by: Amit Kumar Salecha <amit.salecha@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/qlcnic/qlcnic_main.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/net/qlcnic/qlcnic_main.c b/drivers/net/qlcnic/qlcnic_main.c index 3c8a963f68a..bfc55102953 100644 --- a/drivers/net/qlcnic/qlcnic_main.c +++ b/drivers/net/qlcnic/qlcnic_main.c @@ -1949,8 +1949,8 @@ static void qlcnic_poll_controller(struct net_device *netdev) } #endif -static void -qlcnic_set_drv_state(struct qlcnic_adapter *adapter, int state) +static int +qlcnic_set_drv_state(struct qlcnic_adapter *adapter, u8 state) { u32 val; @@ -1958,7 +1958,7 @@ qlcnic_set_drv_state(struct qlcnic_adapter *adapter, int state) state != QLCNIC_DEV_NEED_QUISCENT); if (qlcnic_api_lock(adapter)) - return ; + return -EIO; val = QLCRD32(adapter, QLCNIC_CRB_DRV_STATE); @@ -1970,6 +1970,8 @@ qlcnic_set_drv_state(struct qlcnic_adapter *adapter, int state) QLCWR32(adapter, QLCNIC_CRB_DRV_STATE, val); qlcnic_api_unlock(adapter); + + return 0; } static int @@ -2195,7 +2197,8 @@ qlcnic_detach_work(struct work_struct *work) if (adapter->temp == QLCNIC_TEMP_PANIC) goto err_ret; - qlcnic_set_drv_state(adapter, adapter->dev_state); + if (qlcnic_set_drv_state(adapter, adapter->dev_state)) + goto err_ret; adapter->fw_wait_cnt = 0; |