diff options
| author | Martin K. Petersen <martin.petersen@oracle.com> | 2022-02-14 21:51:29 -0500 |
|---|---|---|
| committer | Martin K. Petersen <martin.petersen@oracle.com> | 2022-02-14 21:51:29 -0500 |
| commit | ac2beb4e3bd75b0049068516b9d42201bda0ded3 (patch) | |
| tree | 09cedfe4495364c2e1114370e282b6028079a565 /drivers/scsi/bfa | |
| parent | 22754f7fbb4030eb2d5e73c2a2db63637ed1d105 (diff) | |
| parent | 5852ed2a6a39c862c8a3fdf646e1f4e01b91d710 (diff) | |
| download | linux-ac2beb4e3bd75b0049068516b9d42201bda0ded3.tar.gz linux-ac2beb4e3bd75b0049068516b9d42201bda0ded3.tar.bz2 linux-ac2beb4e3bd75b0049068516b9d42201bda0ded3.zip | |
Merge branch '5.17/scsi-fixes' into 5.18/scsi-staging
Pull 5.17 fixes branch into 5.18 tree to resolve a few pm8001 driver
merge conflicts.
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/scsi/bfa')
| -rw-r--r-- | drivers/scsi/bfa/bfad.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/scsi/bfa/bfad.c b/drivers/scsi/bfa/bfad.c index 440ef32be048..e5aa982ffedc 100644 --- a/drivers/scsi/bfa/bfad.c +++ b/drivers/scsi/bfa/bfad.c @@ -732,9 +732,6 @@ bfad_pci_init(struct pci_dev *pdev, struct bfad_s *bfad) pci_set_master(pdev); rc = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64)); - if (rc) - rc = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32)); - if (rc) { rc = -ENODEV; printk(KERN_ERR "dma_set_mask_and_coherent fail %p\n", pdev); @@ -1560,9 +1557,6 @@ bfad_pci_slot_reset(struct pci_dev *pdev) rc = dma_set_mask_and_coherent(&bfad->pcidev->dev, DMA_BIT_MASK(64)); if (rc) - rc = dma_set_mask_and_coherent(&bfad->pcidev->dev, - DMA_BIT_MASK(32)); - if (rc) goto out_disable_device; if (restart_bfa(bfad) == -1) |