Merge tag 'acpi-5.1-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...

[linux-2.6-microblaze.git] / drivers / infiniband / hw / hfi1 / vnic_sdma.c

diff --git a/drivers/infiniband/hw/hfi1/vnic_sdma.c b/drivers/infiniband/hw/hfi1/vnic_sdma.c
index 1f81c48..af1b1ff 100644 (file)
--- a/drivers/infiniband/hw/hfi1/vnic_sdma.c
+++ b/drivers/infiniband/hw/hfi1/vnic_sdma.c
@@ -240,8 +240,10 @@ static int hfi1_vnic_sdma_sleep(struct sdma_engine *sde,
        }
 
        vnic_sdma->state = HFI1_VNIC_SDMA_Q_DEFERRED;
-       if (list_empty(&vnic_sdma->wait.list))
+       if (list_empty(&vnic_sdma->wait.list)) {
+               iowait_get_priority(wait->iow);
                iowait_queue(pkts_sent, wait->iow, &sde->dmawait);
+       }
        write_sequnlock(&sde->waitlock);
        return -EBUSY;
 }
@@ -281,7 +283,7 @@ void hfi1_vnic_sdma_init(struct hfi1_vnic_vport_info *vinfo)
 
                iowait_init(&vnic_sdma->wait, 0, NULL, NULL,
                            hfi1_vnic_sdma_sleep,
-                           hfi1_vnic_sdma_wakeup, NULL);
+                           hfi1_vnic_sdma_wakeup, NULL, NULL);
                vnic_sdma->sde = &vinfo->dd->per_sdma[i];
                vnic_sdma->dd = vinfo->dd;
                vnic_sdma->vinfo = vinfo;