Skip to content

Commit

Permalink
Merge branch 'release_4.13_to_4.14' into release_4.4_to_4.7
Browse files Browse the repository at this point in the history
  • Loading branch information
Kelvin Cao committed Jan 29, 2018
2 parents bf92165 + e2f9baa commit 849c6b5
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions switchtec.c
Original file line number Diff line number Diff line change
Expand Up @@ -144,10 +144,6 @@ static void mrpc_cmd_submit(struct switchtec_dev *stdev)
stuser->data, stuser->data_len);
iowrite32(stuser->cmd, &stdev->mmio_mrpc->cmd);

stuser->status = ioread32(&stdev->mmio_mrpc->status);
if (stuser->status != SWITCHTEC_MRPC_STATUS_INPROGRESS)
mrpc_complete_cmd(stdev);

schedule_delayed_work(&stdev->mrpc_timeout,
msecs_to_jiffies(500));
}
Expand Down

0 comments on commit 849c6b5

Please sign in to comment.