renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-26 06:04:14 +08:00
Code

MMC host:

Browse Source 
- meson-mx-sdio: Fix OF child-node lookup
  - omap_hsmmc: Fix wakeirq handling on removal
 -----BEGIN PGP SIGNATURE-----
 
 iQJLBAABCgA1FiEEugLDXPmKSktSkQsV/iaEJXNYjCkFAluae48XHHVsZi5oYW5z
 c29uQGxpbmFyby5vcmcACgkQ/iaEJXNYjCn6uhAAg2pv2tvr0+9YqikncIzIu/OE
 64PPKjC99tyjC20MPurPPMEvdIDU+XmPUPp1BSarIdd796LBgKOu28hD89zxtip9
 8F/hQrF3e1J4Q4wp0i3r36w5rzsTUiN9Zf+x9mX0sC1Ph2vRl96HwJQfyl9j9i7j
 1AC5cpwjv/id8EbdFwQeqlz3pVHkGrg/Iu/J/Uxlon5TzDvFOlHsYqx9eQX5RTdW
 3jXubNc6cXdISiNCoLEb19NFHf58AFITjEqkm2e4l5wDQYIkQq7kp1n0xIuYJzjT
 O0mbWLsrz9Gdvw4E89PXb+QGNIlqPEZGdcBgm/M3RzbawH/RW21G2Yrv4WIzvV2I
 Fnw6rrbP8n6W33MgBnYOCSISRpq8wFm2QsFAfdxBjemUnVod/o3Bcgq4VlQOhqr5
 AR9aJtTttj/EyVqvngXKbyG4ANXBi3/c4z2VMioLb7f4wbCtnL07yZCanDkIcy2B
 W2x0vO+b2FUvVXgNOg2IU09FcbFDUhxCv5a9OS/NAKxkVPmcTg2G7KLbLW7Om6si
 VEKj6ti75yf3DFJ0atcPTnVcv7vae5ghXKXYyZd5KyhU85LLA9huctMMWPSg18ZP
 slkvyFXayykI5Xh6lJ/xbl0kembEf2+QyxNjR73WY5g7s1m2Zm4XcYPWPvYmn6G7
 aSZ3duOZvjGyow2hl8o=
 =wopj
 -----END PGP SIGNATURE-----

Merge tag 'mmc-v4.19-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc

Pull MMC host fixes from Ulf Hansson:

 - meson-mx-sdio: Fix OF child-node lookup

 - omap_hsmmc: Fix wakeirq handling on removal

* tag 'mmc-v4.19-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc:
  mmc: meson-mx-sdio: fix OF child-node lookup
  mmc: omap_hsmmc: fix wakeirq handling on removal
This commit is contained in:
Linus Torvalds 2018-09-13 18:49:23 -10:00
commit 4624d6ea1b
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/mmc/host/meson-mx-sdio.c
View File

@ -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) static struct platform_device *meson_mx_mmc_slot_pdev(struct device *parent)
{ {
struct device_node *slot_node; struct device_node *slot_node;
struct platform_device *pdev;
/* /*
* TODO: the MMC core framework currently does not support * TODO: the MMC core framework currently does not support
* controllers with multiple slots properly. So we only register * controllers with multiple slots properly. So we only register
* the first slot for now * 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) { if (!slot_node) {
dev_warn(parent, "no 'mmc-slot' sub-node found\n"); dev_warn(parent, "no 'mmc-slot' sub-node found\n");
return ERR_PTR(-ENOENT); 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) static int meson_mx_mmc_add_host(struct meson_mx_mmc_host *host)

1
drivers/mmc/host/omap_hsmmc.c
View File

@ -2177,6 +2177,7 @@ static int omap_hsmmc_remove(struct platform_device *pdev)
dma_release_channel(host->tx_chan); dma_release_channel(host->tx_chan);
dma_release_channel(host->rx_chan); dma_release_channel(host->rx_chan);
dev_pm_clear_wake_irq(host->dev);
pm_runtime_dont_use_autosuspend(host->dev); pm_runtime_dont_use_autosuspend(host->dev);
pm_runtime_put_sync(host->dev); pm_runtime_put_sync(host->dev);
pm_runtime_disable(host->dev); pm_runtime_disable(host->dev);