Merge tag 'pci-v4.21-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaa...
[sfrench/cifs-2.6.git] / drivers / pci / pci-driver.c
index 33f3f475e5c6bc7bd7288cd17df61af5ff1446ce..79b1610a8bebe7c156125ccf877e8e3b50e58d2d 100644 (file)
@@ -1597,10 +1597,8 @@ static int pci_dma_configure(struct device *dev)
                ret = of_dma_configure(dev, bridge->parent->of_node, true);
        } else if (has_acpi_companion(bridge)) {
                struct acpi_device *adev = to_acpi_device_node(bridge->fwnode);
-               enum dev_dma_attr attr = acpi_get_dma_attr(adev);
 
-               if (attr != DEV_DMA_NOT_SUPPORTED)
-                       ret = acpi_dma_configure(dev, attr);
+               ret = acpi_dma_configure(dev, acpi_get_dma_attr(adev));
        }
 
        pci_put_host_bridge_device(bridge);