diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-11-04 08:10:35 +0100 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-11-04 08:10:35 +0100 |
| commit | b6d0137d6156db54a9e6ff74458ed4342a45abb5 (patch) | |
| tree | ae4139b2af5af7e382208645d4b66ff184c1e53a /drivers/pcmcia/yenta_socket.c | |
| parent | video: sh_mobile_lcdcfb: Don't attempt to map zero-length scatterlists. (diff) | |
| parent | Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block (diff) | |
| download | linux-b6d0137d6156db54a9e6ff74458ed4342a45abb5.tar.xz linux-b6d0137d6156db54a9e6ff74458ed4342a45abb5.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/pcmcia/yenta_socket.c')
| -rw-r--r-- | drivers/pcmcia/yenta_socket.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/drivers/pcmcia/yenta_socket.c b/drivers/pcmcia/yenta_socket.c index abe0e44c6e9e..8be4cc447a17 100644 --- a/drivers/pcmcia/yenta_socket.c +++ b/drivers/pcmcia/yenta_socket.c @@ -1275,16 +1275,26 @@ static int yenta_dev_resume_noirq(struct device *dev) if (socket->type && socket->type->restore_state) socket->type->restore_state(socket); - return pcmcia_socket_dev_resume(dev); + pcmcia_socket_dev_early_resume(dev); + return 0; +} + +static int yenta_dev_resume(struct device *dev) +{ + pcmcia_socket_dev_late_resume(dev); + return 0; } static struct dev_pm_ops yenta_pm_ops = { .suspend_noirq = yenta_dev_suspend_noirq, .resume_noirq = yenta_dev_resume_noirq, + .resume = yenta_dev_resume, .freeze_noirq = yenta_dev_suspend_noirq, .thaw_noirq = yenta_dev_resume_noirq, + .thaw = yenta_dev_resume, .poweroff_noirq = yenta_dev_suspend_noirq, .restore_noirq = yenta_dev_resume_noirq, + .restore = yenta_dev_resume, }; #define YENTA_PM_OPS (¥ta_pm_ops) |