From f00d3c4605a36eee8ed3d30f4596e8a630becc5a Mon Sep 17 00:00:00 2001 From: "philipl@overt.org" Date: Sun, 18 Jan 2009 14:11:20 -0500 Subject: [PATCH] --- yaml --- r: 130727 b: refs/heads/master c: 06cc1c880095063fa40b0a640ac0003b43107b40 h: refs/heads/master i: 130725: 7c6020321abb3e6e58f41848703a3d917830ffd4 130723: 0288ff46f59a814850adf29c94c2c7dc5c47c340 130719: 413d88523ffb6743775af80e50def6e706ad351a v: v3 --- [refs] | 2 +- trunk/drivers/mmc/host/ricoh_mmc.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index a84b2666984d..c1f44b7c7b69 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cc30d60e4ca0b68e7e3f906eddd1e5b995d349f8 +refs/heads/master: 06cc1c880095063fa40b0a640ac0003b43107b40 diff --git a/trunk/drivers/mmc/host/ricoh_mmc.c b/trunk/drivers/mmc/host/ricoh_mmc.c index be9e7b32b34e..f62790513322 100644 --- a/trunk/drivers/mmc/host/ricoh_mmc.c +++ b/trunk/drivers/mmc/host/ricoh_mmc.c @@ -196,7 +196,7 @@ static void __devexit ricoh_mmc_remove(struct pci_dev *pdev) pci_set_drvdata(pdev, NULL); } -static int ricoh_mmc_suspend(struct pci_dev *pdev, pm_message_t state) +static int ricoh_mmc_suspend_late(struct pci_dev *pdev, pm_message_t state) { struct pci_dev *fw_dev = NULL; @@ -210,7 +210,7 @@ static int ricoh_mmc_suspend(struct pci_dev *pdev, pm_message_t state) return 0; } -static int ricoh_mmc_resume(struct pci_dev *pdev) +static int ricoh_mmc_resume_early(struct pci_dev *pdev) { struct pci_dev *fw_dev = NULL; @@ -229,8 +229,8 @@ static struct pci_driver ricoh_mmc_driver = { .id_table = pci_ids, .probe = ricoh_mmc_probe, .remove = __devexit_p(ricoh_mmc_remove), - .suspend = ricoh_mmc_suspend, - .resume = ricoh_mmc_resume, + .suspend_late = ricoh_mmc_suspend_late, + .resume_early = ricoh_mmc_resume_early, }; /*****************************************************************************\