The patch titled
dm1105: fix the misuse of pci_dma_mapping_error
has been added to the -mm tree. Its filename is
dm1105-fix-the-misuse-of-pci_dma_mapping_error.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: dm1105: fix the misuse of pci_dma_mapping_error
From: FUJITA Tomonori <fujita.tomonori@xxxxxxxxxxxxx>
pci_dma_mapping_error can't be used for pci_alloc_consistent
(pci_dma_mapping_error is for dma_map_single and dma_map_page).
pci_alloc_consistent returns NULL if the allocation fails.
Signed-off-by: FUJITA Tomonori <fujita.tomonori@xxxxxxxxxxxxx>
Cc: Mauro Carvalho Chehab <mchehab@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/media/dvb/dm1105/dm1105.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -puN drivers/media/dvb/dm1105/dm1105.c~dm1105-fix-the-misuse-of-pci_dma_mapping_error drivers/media/dvb/dm1105/dm1105.c
--- a/drivers/media/dvb/dm1105/dm1105.c~dm1105-fix-the-misuse-of-pci_dma_mapping_error
+++ a/drivers/media/dvb/dm1105/dm1105.c
@@ -367,7 +367,7 @@ static int __devinit dm1105dvb_dma_map(s
{
dm1105dvb->ts_buf = pci_alloc_consistent(dm1105dvb->pdev, 6*DM1105_DMA_BYTES, &dm1105dvb->dma_addr);
- return pci_dma_mapping_error(dm1105dvb->pdev, dm1105dvb->dma_addr);
+ return !dm1105dvb->ts_buf;
}
static void dm1105dvb_dma_unmap(struct dm1105dvb *dm1105dvb)
_
Patches currently in -mm which might be from fujita.tomonori@xxxxxxxxxxxxx are
origin.patch
cciss-fix-regression-firmware-not-displayed-in-procfs-again-and-again.patch
linux-next.patch
megaraid-fix-mega_internal_command-oops.patch
dm1105-fix-the-misuse-of-pci_dma_mapping_error.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
