Commit 0da7c322 authored by Luo bin's avatar Luo bin Committed by David S. Miller
Browse files

hinic: fix wrong para of wait_for_completion_timeout 



the second input parameter of wait_for_completion_timeout should
be jiffies instead of millisecond

Signed-off-by: default avatarLuo bin <luobin9@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 33f15da2

drivers/net/ethernet/huawei/hinic/hinic_hw_cmdq.c

+2 −1
Original line number Diff line number Diff line
@@ -389,7 +389,8 @@ static int cmdq_sync_cmd_direct_resp(struct hinic_cmdq *cmdq, 


	spin_unlock_bh(&cmdq->cmdq_lock);



	if (!wait_for_completion_timeout(&done, CMDQ_TIMEOUT)) {

	if (!wait_for_completion_timeout(&done,

					 msecs_to_jiffies(CMDQ_TIMEOUT))) {

		spin_lock_bh(&cmdq->cmdq_lock);



		if (cmdq->errcode[curr_prod_idx] == &errcode)

drivers/net/ethernet/huawei/hinic/hinic_hw_mgmt.c

+3 −2
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ 


#define MSG_NOT_RESP                    0xFFFF



#define MGMT_MSG_TIMEOUT                1000

#define MGMT_MSG_TIMEOUT                5000



#define mgmt_to_pfhwdev(pf_mgmt)        \

		container_of(pf_mgmt, struct hinic_pfhwdev, pf_to_mgmt)
@@ -267,7 +267,8 @@ static int msg_to_mgmt_sync(struct hinic_pf_to_mgmt *pf_to_mgmt, 
		goto unlock_sync_msg;

	}



	if (!wait_for_completion_timeout(recv_done, MGMT_MSG_TIMEOUT)) {

	if (!wait_for_completion_timeout(recv_done,

					 msecs_to_jiffies(MGMT_MSG_TIMEOUT))) {

		dev_err(&pdev->dev, "MGMT timeout, MSG id = %d\n", msg_id);

		err = -ETIMEDOUT;

		goto unlock_sync_msg;