Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3e344b6c authored by Hannes Reinecke's avatar Hannes Reinecke Committed by Martin K. Petersen
Browse files

scsi: hptiop: fix calls to dma_set_mask() 



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: 453cd370 ("scsi: hptiop: use dma_set_mask")
Cc: <stable@vger.kernel.org>
Suggested-by: default avatarEwan D. Milne <emilne@redhat.com>
Signed-off-by: default avatarHannes Reinecke <hare@suse.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarEwan D. Milne <emilne@redhat.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent d9a00459

drivers/scsi/hptiop.c

+7 −3
Original line number Diff line number Diff line
@@ -1292,6 +1292,7 @@ static int hptiop_probe(struct pci_dev *pcidev, const struct pci_device_id *id) 
	dma_addr_t start_phy;

	void *start_virt;

	u32 offset, i, req_size;

	int rc;



	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 */

	iop_ops = (struct hptiop_adapter_ops *)id->driver_data;

	if (dma_set_mask(&pcidev->dev,

			 DMA_BIT_MASK(iop_ops->hw_dma_bit_mask)) ||

	    dma_set_mask(&pcidev->dev, DMA_BIT_MASK(32))) {

	rc = dma_set_mask(&pcidev->dev,

			  DMA_BIT_MASK(iop_ops->hw_dma_bit_mask));

	if (rc)

		rc = dma_set_mask(&pcidev->dev, DMA_BIT_MASK(32));



	if (rc) {

		printk(KERN_ERR "hptiop: fail to set dma_mask\n");

		goto disable_pci_device;

	}