diff --git a/[refs] b/[refs] index b1f31778c826..906996a99842 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 24c31eede658c30e4fcc93505589fd519c3aa4b8 +refs/heads/master: 9e91fdb32d449a6b57f8236a793ae2f3df79b4d8 diff --git a/trunk/lib/swiotlb.c b/trunk/lib/swiotlb.c index c419ecf334c3..752fd95323f3 100644 --- a/trunk/lib/swiotlb.c +++ b/trunk/lib/swiotlb.c @@ -696,7 +696,7 @@ swiotlb_map_sg(struct device *hwdev, struct scatterlist *sgl, int nelems, /* Don't panic here, we expect map_sg users to do proper error handling. */ swiotlb_full(hwdev, sg->length, dir, 0); - swiotlb_unmap_sg(hwdev, sg - i, i, dir); + swiotlb_unmap_sg(hwdev, sgl, i, dir); sgl[0].dma_length = 0; return 0; }