forked from mirrors/linux
		
	scsi: hptiop: use dma_set_mask
The driver currently uses pci_set_dma_mask despite otherwise using the generic DMA API. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
		
							parent
							
								
									e4db40e7a1
								
							
						
					
					
						commit
						453cd3700c
					
				
					 1 changed files with 5 additions and 5 deletions
				
			
		|  | @ -1309,11 +1309,11 @@ 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 (pci_set_dma_mask(pcidev, DMA_BIT_MASK(iop_ops->hw_dma_bit_mask))) { | 	if (dma_set_mask(&pcidev->dev, | ||||||
| 		if (pci_set_dma_mask(pcidev, DMA_BIT_MASK(32))) { | 			 DMA_BIT_MASK(iop_ops->hw_dma_bit_mask)) || | ||||||
| 			printk(KERN_ERR "hptiop: fail to set dma_mask\n"); | 	    dma_set_mask(&pcidev->dev, DMA_BIT_MASK(32))) { | ||||||
| 			goto disable_pci_device; | 		printk(KERN_ERR "hptiop: fail to set dma_mask\n"); | ||||||
| 		} | 		goto disable_pci_device; | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
| 	if (pci_request_regions(pcidev, driver_name)) { | 	if (pci_request_regions(pcidev, driver_name)) { | ||||||
|  |  | ||||||
		Loading…
	
		Reference in a new issue
	
	 Christoph Hellwig
						Christoph Hellwig