diff for duplicates of <20150204140911.GA23076@sloth> diff --git a/a/1.txt b/N1/1.txt index 52a3a49..60c4710 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -152,7 +152,7 @@ index 7d2e42d..aba6866 100644 @@ -184,9 +184,10 @@ struct mthca_icm *mthca_alloc_icm(struct mthca_dev *dev, int npages, if (coherent) ++chunk->nsg; - else if (chunk->npages = MTHCA_ICM_CHUNK_LEN) { + else if (chunk->npages == MTHCA_ICM_CHUNK_LEN) { - chunk->nsg = pci_map_sg(dev->pdev, chunk->mem, + chunk->nsg = dma_map_sg(&dev->pdev->dev, + chunk->mem, diff --git a/a/content_digest b/N1/content_digest index 3bb2bfe..6f860ef 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Quentin Lambert <lambert.quentin@gmail.com>\0" "Subject\0[PATCH 1/1] IB/mthca: remove deprecated use of pci api\0" - "Date\0Wed, 04 Feb 2015 14:09:11 +0000\0" + "Date\0Wed, 4 Feb 2015 15:09:11 +0100\0" "To\0Roland Dreier <roland@kernel.org>" Sean Hefty <sean.hefty@intel.com> " Hal Rosenstock <hal.rosenstock@gmail.com>\0" @@ -163,7 +163,7 @@ "@@ -184,9 +184,10 @@ struct mthca_icm *mthca_alloc_icm(struct mthca_dev *dev, int npages,\n" " \t\t\tif (coherent)\n" " \t\t\t\t++chunk->nsg;\n" - " \t\t\telse if (chunk->npages = MTHCA_ICM_CHUNK_LEN) {\n" + " \t\t\telse if (chunk->npages == MTHCA_ICM_CHUNK_LEN) {\n" "-\t\t\t\tchunk->nsg = pci_map_sg(dev->pdev, chunk->mem,\n" "+\t\t\t\tchunk->nsg = dma_map_sg(&dev->pdev->dev,\n" "+\t\t\t\t\t\t\tchunk->mem,\n" @@ -219,4 +219,4 @@ "-- \n" 1.9.1 -2d597797bf52637949fe5955bd7ad1e3e00e4cbe66a0393884f49baba8c91894 +d675145627c58ad3a7451aacd514f7ea4274ca55b58aa6cd124bbdb14cf42008
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.