diff for duplicates of <20150219094319.GA11743@sloth> diff --git a/a/1.txt b/N1/1.txt index 9a6bff3..a569088 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -154,7 +154,7 @@ index 7d2e42d..3bca68f 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 7a3d52f..4cbe794 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Quentin Lambert <lambert.quentin@gmail.com>\0" "Subject\0[PATCH v2 1/1] IB/mthca: remove deprecated use of pci api\0" - "Date\0Thu, 19 Feb 2015 09:43:19 +0000\0" + "Date\0Thu, 19 Feb 2015 10:43:19 +0100\0" "To\0Roland Dreier <roland@kernel.org>" Sean Hefty <sean.hefty@intel.com> " Hal Rosenstock <hal.rosenstock@gmail.com>\0" @@ -165,7 +165,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" @@ -221,4 +221,4 @@ "-- \n" 1.9.1 -4a6b184449420fff9df8ae413b594f72181c5a73713984f678123ad8c05a4077 +db2fa531dd9bd43446c59c986240808e353f554957113769aaf680f0b5e3cd90
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.