From: Robert Elliott <elliott@hp.com>
Date: Fri, 23 Jan 2015 22:42:37 +0000 (-0600)
Subject: hpsa: pass error from pci_set_consistent_dma_mask from hpsa_message
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1eaec8f33e14afae5820a25059a59d9119ca308f;p=linux-beck.git

hpsa: pass error from pci_set_consistent_dma_mask from hpsa_message

Return the actual error code instead of a generic error code.

Reviewed-by: Scott Teel <scott.teel@pmcs.com>
Signed-off-by: Robert Elliott <elliott@hp.com>
Signed-off-by: Don Brace <don.brace@pmcs.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
---

diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index f29f569e0a5b..64d17d1a848b 100644
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -5610,7 +5610,7 @@ static int hpsa_message(struct pci_dev *pdev, unsigned char opcode,
 	err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
 	if (err) {
 		iounmap(vaddr);
-		return -ENOMEM;
+		return err;
 	}
 
 	cmd = pci_alloc_consistent(pdev, cmd_sz, &paddr64);