|
@@ -289,7 +289,7 @@ static int xgbe_alloc_pages(struct xgbe_prv_data *pdata,
|
|
|
struct page *pages = NULL;
|
|
struct page *pages = NULL;
|
|
|
dma_addr_t pages_dma;
|
|
dma_addr_t pages_dma;
|
|
|
gfp_t gfp;
|
|
gfp_t gfp;
|
|
|
- int order, ret;
|
|
|
|
|
|
|
+ int order;
|
|
|
|
|
|
|
|
again:
|
|
again:
|
|
|
order = alloc_order;
|
|
order = alloc_order;
|
|
@@ -316,10 +316,9 @@ again:
|
|
|
/* Map the pages */
|
|
/* Map the pages */
|
|
|
pages_dma = dma_map_page(pdata->dev, pages, 0,
|
|
pages_dma = dma_map_page(pdata->dev, pages, 0,
|
|
|
PAGE_SIZE << order, DMA_FROM_DEVICE);
|
|
PAGE_SIZE << order, DMA_FROM_DEVICE);
|
|
|
- ret = dma_mapping_error(pdata->dev, pages_dma);
|
|
|
|
|
- if (ret) {
|
|
|
|
|
|
|
+ if (dma_mapping_error(pdata->dev, pages_dma)) {
|
|
|
put_page(pages);
|
|
put_page(pages);
|
|
|
- return ret;
|
|
|
|
|
|
|
+ return -ENOMEM;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
pa->pages = pages;
|
|
pa->pages = pages;
|