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/hisi_sas/hisi_sas_v3_hw.c | |
| parent | scsi: mpi3mr: Bump driver version to 8.0.0.68.0 (diff) | |
| parent | scsi: lpfc: Reduce log messages seen after firmware download (diff) | |
| download | linux-dev-ac2beb4e3bd75b0049068516b9d42201bda0ded3.tar.xz linux-dev-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/hisi_sas/hisi_sas_v3_hw.c')
| -rw-r--r-- | drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c index e89baf24f3d6..e472068cc256 100644 --- a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c +++ b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c @@ -4694,8 +4694,6 @@ hisi_sas_v3_probe(struct pci_dev *pdev, const struct pci_device_id *id) goto err_out; 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) { dev_err(dev, "No usable DMA addressing method\n"); rc = -ENODEV; |