Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma

Pull slave-dma fixes from Vinod Koul:
 "We have two patches from Andy & Rafael fixing the Lynxpoint dma"

* 'fixes' of git://git.infradead.org/users/vkoul/slave-dma:
  ACPI / LPSS: register clock device for Lynxpoint DMA properly
  dma: acpi-dma: parse CSRT to extract additional resources

diff --combined drivers/acpi/scan.c
index c1bc608339a6007b9d1ecbbd0f2669626d4a538f,aacc08f951aac190b09062f8fd66acf5d65234d2..44225cb15f3a248fb842c6e3b3d3f188f47aa99d
--- 1/drivers/acpi/scan.c
--- 2/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@@ -1785,7 -1785,7 +1785,7 @@@ static void acpi_scan_init_hotplug(acpi
        acpi_set_pnp_ids(handle, &pnp, type);
  
        if (!pnp.type.hardware_id)
 -              return;
 +              goto out;
  
        /*
         * This relies on the fact that acpi_install_notify_handler() will not
@@@ -1800,7 -1800,6 +1800,7 @@@
                }
        }
  
 +out:
        acpi_free_pnp_ids(&pnp);
  }
  
@@@ -2043,7 -2042,6 +2043,6 @@@ int __init acpi_scan_init(void
        acpi_pci_link_init();
        acpi_platform_init();
        acpi_lpss_init();
-       acpi_csrt_init();
        acpi_container_init();
        acpi_memory_hotplug_init();