kernel-janitors.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [patch] fnic: pci_dma_mapping_error() doesn't return an error code
@ 2016-07-07  8:23 Dan Carpenter
  2016-07-21  0:49 ` Martin K. Petersen
  0 siblings, 1 reply; 2+ messages in thread
From: Dan Carpenter @ 2016-07-07  8:23 UTC (permalink / raw)
  To: Hiral Patel, Maurizio Lombardi
  Cc: Suma Ramars, Brian Uchino, James E.J. Bottomley,
	Martin K. Petersen, linux-scsi, kernel-janitors

pci_dma_mapping_error() returns true on error and false on success.

Fixes: fd6ddfa4c1dd ('fnic: check pci_map_single() return value')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

diff --git a/drivers/scsi/fnic/fnic_fcs.c b/drivers/scsi/fnic/fnic_fcs.c
index 67669a9..f3a3331 100644
--- a/drivers/scsi/fnic/fnic_fcs.c
+++ b/drivers/scsi/fnic/fnic_fcs.c
@@ -954,8 +954,8 @@ int fnic_alloc_rq_frame(struct vnic_rq *rq)
 	skb_put(skb, len);
 	pa = pci_map_single(fnic->pdev, skb->data, len, PCI_DMA_FROMDEVICE);
 
-	r = pci_dma_mapping_error(fnic->pdev, pa);
-	if (r) {
+	if (pci_dma_mapping_error(fnic->pdev, pa)) {
+		r = -ENOMEM;
 		printk(KERN_ERR "PCI mapping failed with error %d\n", r);
 		goto free_skb;
 	}
@@ -1093,8 +1093,8 @@ static int fnic_send_frame(struct fnic *fnic, struct fc_frame *fp)
 
 	pa = pci_map_single(fnic->pdev, eth_hdr, tot_len, PCI_DMA_TODEVICE);
 
-	ret = pci_dma_mapping_error(fnic->pdev, pa);
-	if (ret) {
+	if (pci_dma_mapping_error(fnic->pdev, pa)) {
+		ret = -ENOMEM;
 		printk(KERN_ERR "DMA map failed with error %d\n", ret);
 		goto free_skb_on_err;
 	}

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [patch] fnic: pci_dma_mapping_error() doesn't return an error code
  2016-07-07  8:23 [patch] fnic: pci_dma_mapping_error() doesn't return an error code Dan Carpenter
@ 2016-07-21  0:49 ` Martin K. Petersen
  0 siblings, 0 replies; 2+ messages in thread
From: Martin K. Petersen @ 2016-07-21  0:49 UTC (permalink / raw)
  To: Dan Carpenter
  Cc: Hiral Patel, Maurizio Lombardi, Suma Ramars, Brian Uchino,
	James E.J. Bottomley, Martin K. Petersen, linux-scsi,
	kernel-janitors

>>>>> "Dan" = Dan Carpenter <dan.carpenter@oracle.com> writes:

Dan> pci_dma_mapping_error() returns true on error and false on success.
Dan> Fixes: fd6ddfa4c1dd ('fnic: check pci_map_single() return value')

Applied to 4.8/scsi-queue.

-- 
Martin K. Petersen	Oracle Linux Engineering

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2016-07-21  0:49 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-07-07  8:23 [patch] fnic: pci_dma_mapping_error() doesn't return an error code Dan Carpenter
2016-07-21  0:49 ` Martin K. Petersen

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).