Merge tag 'mmc-v4.19-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc (4624d6ea) · Commits · 戴 / test

drivers/mmc/host/meson-mx-sdio.c

+6 −2

Original line number	Diff line number	Diff line
		@@ -517,19 +517,23 @@ static struct mmc_host_ops meson_mx_mmc_ops = {
		static struct platform_device meson_mx_mmc_slot_pdev(struct device parent)
		{
		struct device_node *slot_node;
		struct platform_device *pdev;

		/*
		* TODO: the MMC core framework currently does not support
		* controllers with multiple slots properly. So we only register
		* the first slot for now
		*/
		slot_node = of_find_compatible_node(parent->of_node, NULL, "mmc-slot");
		slot_node = of_get_compatible_child(parent->of_node, "mmc-slot");
		if (!slot_node) {
		dev_warn(parent, "no 'mmc-slot' sub-node found\n");
		return ERR_PTR(-ENOENT);
		}

		return of_platform_device_create(slot_node, NULL, parent);
		pdev = of_platform_device_create(slot_node, NULL, parent);
		of_node_put(slot_node);

		return pdev;
		}

		static int meson_mx_mmc_add_host(struct meson_mx_mmc_host *host)

+1 −0

Original line number	Diff line number	Diff line
		@@ -2177,6 +2177,7 @@ static int omap_hsmmc_remove(struct platform_device *pdev)
		dma_release_channel(host->tx_chan);
		dma_release_channel(host->rx_chan);

		dev_pm_clear_wake_irq(host->dev);
		pm_runtime_dont_use_autosuspend(host->dev);
		pm_runtime_put_sync(host->dev);
		pm_runtime_disable(host->dev);