sugar/linux
1
0
Fork 0
Code Activity

scsi: hptiop: fix calls to dma_set_mask()

Browse Source 
The change to use dma_set_mask() incorrectly made a second call with the 32
bit DMA mask value when the call with the 64 bit DMA mask value succeeded.

Fixes: 453cd3700c ("scsi: hptiop: use dma_set_mask")
Cc: <stable@vger.kernel.org>
Suggested-by: Ewan D. Milne <emilne@redhat.com>
Signed-off-by: Hannes Reinecke <hare@suse.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Ewan D. Milne <emilne@redhat.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Hannes Reinecke
2019-02-18 08:34:26 +01:00
committed by Martin K. Petersen
parent d9a00459ef
commit 3e344b6cec
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/scsi/hptiop.c
View File

@@ -1292,6 +1292,7 @@ static int hptiop_probe(struct pci_dev *pcidev, const struct pci_device_id *id)
dma_addr_t start_phy; dma_addr_t start_phy;
void *start_virt; void *start_virt;
u32 offset, i, req_size; u32 offset, i, req_size;
int rc;
dprintk("hptiop_probe(%p)\n", pcidev); dprintk("hptiop_probe(%p)\n", pcidev);
@@ -1308,9 +1309,12 @@ static int hptiop_probe(struct pci_dev *pcidev, const struct pci_device_id *id)
/* Enable 64bit DMA if possible */ /* Enable 64bit DMA if possible */
iop_ops = (struct hptiop_adapter_ops *)id->driver_data; iop_ops = (struct hptiop_adapter_ops *)id->driver_data;
if (dma_set_mask(&pcidev->dev, rc = dma_set_mask(&pcidev->dev,
DMA_BIT_MASK(iop_ops->hw_dma_bit_mask)) || DMA_BIT_MASK(iop_ops->hw_dma_bit_mask));
dma_set_mask(&pcidev->dev, DMA_BIT_MASK(32))) { if (rc)
rc = dma_set_mask(&pcidev->dev, DMA_BIT_MASK(32));
if (rc) {
printk(KERN_ERR "hptiop: fail to set dma_mask\n"); printk(KERN_ERR "hptiop: fail to set dma_mask\n");
goto disable_pci_device; goto disable_pci_device;
} }