Merge 08e14bad94568452317d9da9acf0001e769f5106 into 5751c3fb1adf1f109d9b019073133161a5b44b01

This commit is contained in:
Hans-Peter Jansen 2017-09-11 08:40:42 +00:00 committed by GitHub
commit 6e9c7b5dce

View File

@ -267,7 +267,11 @@ static int dma_alloc(struct pci_dev *pdev, struct ddb_dma *dma, int dir)
return 0; return 0;
for (i = 0; i < dma->num; i++) { for (i = 0; i < dma->num; i++) {
if (alt_dma) { if (alt_dma) {
#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 13, 0))
dma->vbuf[i] = kmalloc(dma->size, __GFP_REPEAT); dma->vbuf[i] = kmalloc(dma->size, __GFP_REPEAT);
#else
dma->vbuf[i] = kmalloc(dma->size, __GFP_RETRY_MAYFAIL);
#endif
if (!dma->vbuf[i]) if (!dma->vbuf[i])
return -ENOMEM; return -ENOMEM;
dma->pbuf[i] = dma_map_single(&pdev->dev, dma->pbuf[i] = dma_map_single(&pdev->dev,