diff options
| author | David S. Miller <davem@davemloft.net> | 2018-04-24 23:59:11 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-04-24 23:59:11 -0400 |
| commit | c749fa181bd5848be78691d23168ec61ce691b95 (patch) | |
| tree | d037dc016bd880d9d5b393a30f3907ef5e98124d /drivers/rapidio/devices/rio_mport_cdev.c | |
| parent | 16f4faa4f06ff3b4e214922d55ac33ab6e2bdbdc (diff) | |
| parent | 3be4aaf4e2d3eb95cce7835e8df797ae65ae5ac1 (diff) | |
| download | op-kernel-dev-c749fa181bd5848be78691d23168ec61ce691b95.zip op-kernel-dev-c749fa181bd5848be78691d23168ec61ce691b95.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/rapidio/devices/rio_mport_cdev.c')
| -rw-r--r-- | drivers/rapidio/devices/rio_mport_cdev.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/drivers/rapidio/devices/rio_mport_cdev.c b/drivers/rapidio/devices/rio_mport_cdev.c index 9d27016c..0434ab7 100644 --- a/drivers/rapidio/devices/rio_mport_cdev.c +++ b/drivers/rapidio/devices/rio_mport_cdev.c @@ -740,10 +740,7 @@ static int do_dma_request(struct mport_dma_req *req, tx->callback = dma_xfer_callback; tx->callback_param = req; - req->dmach = chan; - req->sync = sync; req->status = DMA_IN_PROGRESS; - init_completion(&req->req_comp); kref_get(&req->refcount); cookie = dmaengine_submit(tx); @@ -831,13 +828,20 @@ rio_dma_transfer(struct file *filp, u32 transfer_mode, if (!req) return -ENOMEM; - kref_init(&req->refcount); - ret = get_dma_channel(priv); if (ret) { kfree(req); return ret; } + chan = priv->dmach; + + kref_init(&req->refcount); + init_completion(&req->req_comp); + req->dir = dir; + req->filp = filp; + req->priv = priv; + req->dmach = chan; + req->sync = sync; /* * If parameter loc_addr != NULL, we are transferring data from/to @@ -925,11 +929,6 @@ rio_dma_transfer(struct file *filp, u32 transfer_mode, xfer->offset, xfer->length); } - req->dir = dir; - req->filp = filp; - req->priv = priv; - chan = priv->dmach; - nents = dma_map_sg(chan->device->dev, req->sgt.sgl, req->sgt.nents, dir); if (nents == 0) { |
