diff options
Diffstat (limited to 'drivers/scsi/be2iscsi/be_main.c')
| -rw-r--r-- | drivers/scsi/be2iscsi/be_main.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c index 7b2bd16c8156..3cd4693bc2b4 100644 --- a/drivers/scsi/be2iscsi/be_main.c +++ b/drivers/scsi/be2iscsi/be_main.c | |||
| @@ -679,8 +679,19 @@ static int beiscsi_enable_pci(struct pci_dev *pcidev) | |||
| 679 | } | 679 | } |
| 680 | 680 | ||
| 681 | pci_set_master(pcidev); | 681 | pci_set_master(pcidev); |
| 682 | if (pci_set_consistent_dma_mask(pcidev, DMA_BIT_MASK(64))) { | 682 | ret = pci_set_dma_mask(pcidev, DMA_BIT_MASK(64)); |
| 683 | ret = pci_set_consistent_dma_mask(pcidev, DMA_BIT_MASK(32)); | 683 | if (ret) { |
| 684 | ret = pci_set_dma_mask(pcidev, DMA_BIT_MASK(32)); | ||
| 685 | if (ret) { | ||
| 686 | dev_err(&pcidev->dev, "Could not set PCI DMA Mask\n"); | ||
| 687 | pci_disable_device(pcidev); | ||
| 688 | return ret; | ||
| 689 | } else { | ||
| 690 | ret = pci_set_consistent_dma_mask(pcidev, | ||
| 691 | DMA_BIT_MASK(32)); | ||
| 692 | } | ||
| 693 | } else { | ||
| 694 | ret = pci_set_consistent_dma_mask(pcidev, DMA_BIT_MASK(64)); | ||
| 684 | if (ret) { | 695 | if (ret) { |
| 685 | dev_err(&pcidev->dev, "Could not set PCI DMA Mask\n"); | 696 | dev_err(&pcidev->dev, "Could not set PCI DMA Mask\n"); |
| 686 | pci_disable_device(pcidev); | 697 | pci_disable_device(pcidev); |