@@ -4406,10 +4406,12 @@ megaraid_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
/* Set the Mode of addressing to 64 bit if we can */
if ((adapter->flag & BOARD_64BIT) && (sizeof(dma_addr_t) == 8)) {
- dma_set_mask(&pdev->dev, DMA_BIT_MASK(64));
+ if (dma_set_mask(&pdev->dev, DMA_BIT_MASK(64)))
+ goto out_free_mbox;
adapter->has_64bit_addr = 1;
} else {
- dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
+ if (dma_set_mask(&pdev->dev, DMA_BIT_MASK(32)))
+ goto out_free_mbox;
adapter->has_64bit_addr = 0;
}
pdev->dev cannot perform DMA properly if dma_set_mask() returns non-zero. Add check for dma_set_mask() and return the error if it fails. Fixes: ec090ef8cd1c ("scsi: megaraid: Remove pci-dma-compat wrapper API") Signed-off-by: Haoxiang Li <make24@iscas.ac.cn> --- drivers/scsi/megaraid.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)