summaryrefslogtreecommitdiffstats
path: root/drivers/base/dma-mapping.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/base/dma-mapping.c')
-rw-r--r--drivers/base/dma-mapping.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/base/dma-mapping.c b/drivers/base/dma-mapping.c
index 449b948c7427..82bd45ced7ff 100644
--- a/drivers/base/dma-mapping.c
+++ b/drivers/base/dma-mapping.c
@@ -353,6 +353,7 @@ int dma_configure(struct device *dev)
353{ 353{
354 struct device *bridge = NULL, *dma_dev = dev; 354 struct device *bridge = NULL, *dma_dev = dev;
355 enum dev_dma_attr attr; 355 enum dev_dma_attr attr;
356 int ret = 0;
356 357
357 if (dev_is_pci(dev)) { 358 if (dev_is_pci(dev)) {
358 bridge = pci_get_host_bridge_device(to_pci_dev(dev)); 359 bridge = pci_get_host_bridge_device(to_pci_dev(dev));
@@ -363,7 +364,7 @@ int dma_configure(struct device *dev)
363 } 364 }
364 365
365 if (dma_dev->of_node) { 366 if (dma_dev->of_node) {
366 of_dma_configure(dev, dma_dev->of_node); 367 ret = of_dma_configure(dev, dma_dev->of_node);
367 } else if (has_acpi_companion(dma_dev)) { 368 } else if (has_acpi_companion(dma_dev)) {
368 attr = acpi_get_dma_attr(to_acpi_device_node(dma_dev->fwnode)); 369 attr = acpi_get_dma_attr(to_acpi_device_node(dma_dev->fwnode));
369 if (attr != DEV_DMA_NOT_SUPPORTED) 370 if (attr != DEV_DMA_NOT_SUPPORTED)
@@ -373,7 +374,7 @@ int dma_configure(struct device *dev)
373 if (bridge) 374 if (bridge)
374 pci_put_host_bridge_device(bridge); 375 pci_put_host_bridge_device(bridge);
375 376
376 return 0; 377 return ret;
377} 378}
378 379
379void dma_deconfigure(struct device *dev) 380void dma_deconfigure(struct device *dev)