Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 219006
b: refs/heads/master
c: d3fe37b
h: refs/heads/master
v: v3
  • Loading branch information
Ohad Ben-Cohen authored and Chris Ball committed Oct 23, 2010
1 parent d6c5731 commit bb09c08
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 12ae637f081a7a05144af65802a7b492b9162660
refs/heads/master: d3fe37b1a1d98f060279bfa32fcf5a134851a91a
18 changes: 18 additions & 0 deletions trunk/drivers/mmc/core/sdio.c
Original file line number Diff line number Diff line change
Expand Up @@ -638,11 +638,29 @@ static int mmc_sdio_resume(struct mmc_host *host)
return err;
}

static int mmc_sdio_power_restore(struct mmc_host *host)
{
int ret;

BUG_ON(!host);
BUG_ON(!host->card);

mmc_claim_host(host);
ret = mmc_sdio_init_card(host, host->ocr, host->card,
(host->pm_flags & MMC_PM_KEEP_POWER));
if (!ret && host->sdio_irqs)
mmc_signal_sdio_irq(host);
mmc_release_host(host);

return ret;
}

static const struct mmc_bus_ops mmc_sdio_ops = {
.remove = mmc_sdio_remove,
.detect = mmc_sdio_detect,
.suspend = mmc_sdio_suspend,
.resume = mmc_sdio_resume,
.power_restore = mmc_sdio_power_restore,
};


Expand Down

0 comments on commit bb09c08

Please sign in to comment.