From def052aae05c763d5a40335fb3f058022cbb1195 Mon Sep 17 00:00:00 2001 From: Rajeev KUMAR Date: Wed, 1 Feb 2012 16:12:17 +0530 Subject: [PATCH] --- yaml --- r: 297495 b: refs/heads/master c: 7414a1b8b2b99093d6a271a1220557e87dc1ae94 h: refs/heads/master i: 297493: 5d813ba3999b942b3600c3c765abe946b1503cc7 297491: 54c9d0b4a9be315491978973a5080ad00a648d67 297487: 712946a59929417ad95590d604fa5df21ef2c71d v: v3 --- [refs] | 2 +- trunk/drivers/dma/dw_dmac.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index fd0b82b196bf..07e3413da0f5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 91c1c9e36d9450974c9f04cf961d0b45aafca507 +refs/heads/master: 7414a1b8b2b99093d6a271a1220557e87dc1ae94 diff --git a/trunk/drivers/dma/dw_dmac.c b/trunk/drivers/dma/dw_dmac.c index 9b592b02b5f4..3a3d7edcd553 100644 --- a/trunk/drivers/dma/dw_dmac.c +++ b/trunk/drivers/dma/dw_dmac.c @@ -1562,6 +1562,10 @@ static int dw_resume_noirq(struct device *dev) static const struct dev_pm_ops dw_dev_pm_ops = { .suspend_noirq = dw_suspend_noirq, .resume_noirq = dw_resume_noirq, + .freeze_noirq = dw_suspend_noirq, + .thaw_noirq = dw_resume_noirq, + .restore_noirq = dw_resume_noirq, + .poweroff_noirq = dw_suspend_noirq, }; static struct platform_driver dw_driver = {