diff --git a/[refs] b/[refs] index 5a0f925a41b6..22fd959bcc2a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b286e00304f9c1d27b93753536ac5246a287dd55 +refs/heads/master: 60542505b0bccbc5e2e518c9dd6bee9a30546061 diff --git a/trunk/drivers/crypto/talitos.c b/trunk/drivers/crypto/talitos.c index b299f0902827..8653f601b95f 100644 --- a/trunk/drivers/crypto/talitos.c +++ b/trunk/drivers/crypto/talitos.c @@ -825,7 +825,7 @@ static void ipsec_esp_encrypt_done(struct device *dev, ipsec_esp_unmap(dev, edesc, areq); /* copy the generated ICV to dst */ - if (edesc->dma_len) { + if (edesc->dst_nents) { icvdata = &edesc->link_tbl[edesc->src_nents + edesc->dst_nents + 2]; sg = sg_last(areq->dst, edesc->dst_nents);