diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2017-04-12 21:59:01 -0700 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2017-04-12 21:59:01 -0700 |
| commit | bfca9acf1a5df0ff98fbf47e363adb48612bb7ec (patch) | |
| tree | a50287c88fdc60a73912d205d7bce41b7af53827 /drivers/crypto/ccp/ccp-dmaengine.c | |
| parent | 92a3fa075d3d2716b9c662814540f1d660cbf2f5 (diff) | |
| parent | 11e63f6d920d6f2dfd3cd421e939a4aec9a58dcd (diff) | |
Merge branch 'for-4.11/libnvdimm' into for-4.12/dax
Diffstat (limited to 'drivers/crypto/ccp/ccp-dmaengine.c')
| -rw-r--r-- | drivers/crypto/ccp/ccp-dmaengine.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/crypto/ccp/ccp-dmaengine.c b/drivers/crypto/ccp/ccp-dmaengine.c index e5d9278f4019..8d0eeb46d4a2 100644 --- a/drivers/crypto/ccp/ccp-dmaengine.c +++ b/drivers/crypto/ccp/ccp-dmaengine.c @@ -390,6 +390,7 @@ static struct ccp_dma_desc *ccp_create_desc(struct dma_chan *dma_chan, goto err; ccp_cmd = &cmd->ccp_cmd; + ccp_cmd->ccp = chan->ccp; ccp_pt = &ccp_cmd->u.passthru_nomap; ccp_cmd->flags = CCP_CMD_MAY_BACKLOG; ccp_cmd->flags |= CCP_CMD_PASSTHRU_NO_DMA_MAP; |