| Message ID | 1314900722-10252-1-git-send-email-khilman@ti.com (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
On Thursday 01 September 2011 11:12:02 Kevin Hilman wrote: > The suspend/resume _noirq handlers were #ifdef'd out in the > !CONFIG_SUSPEND case, but were still assigned to the dev_pm_ops > struct. Fix by defining them to NULL in the !CONFIG_SUSPEND case. > > Reported-by: Arnd Bergmann <arnd@arndb.de> > Signed-off-by: Kevin Hilman <khilman@ti.com> Acked-by: Arnd Bergmann <arnd@arndb.de> Thansk for the fast response!
On Thursday, September 01, 2011, Arnd Bergmann wrote: > On Thursday 01 September 2011 11:12:02 Kevin Hilman wrote: > > The suspend/resume _noirq handlers were #ifdef'd out in the > > !CONFIG_SUSPEND case, but were still assigned to the dev_pm_ops > > struct. Fix by defining them to NULL in the !CONFIG_SUSPEND case. > > > > Reported-by: Arnd Bergmann <arnd@arndb.de> > > Signed-off-by: Kevin Hilman <khilman@ti.com> > > Acked-by: Arnd Bergmann <arnd@arndb.de> > > Thansk for the fast response! I'll apply the patch when kernel.org is back in order. Thanks, Rafael
On 09/01/2011 02:57 PM, Rafael J. Wysocki wrote: > On Thursday, September 01, 2011, Arnd Bergmann wrote: >> On Thursday 01 September 2011 11:12:02 Kevin Hilman wrote: >>> The suspend/resume _noirq handlers were #ifdef'd out in the >>> !CONFIG_SUSPEND case, but were still assigned to the dev_pm_ops >>> struct. Fix by defining them to NULL in the !CONFIG_SUSPEND case. >>> >>> Reported-by: Arnd Bergmann<arnd@arndb.de> >>> Signed-off-by: Kevin Hilman<khilman@ti.com> >> >> Acked-by: Arnd Bergmann<arnd@arndb.de> >> >> Thansk for the fast response! > > I'll apply the patch when kernel.org is back in order. > Tony, I spoke w/Rafael and due to hera being down and Rafael traveling to LPC he wont be able to queue this for v3.1. Can you queue up this fix? This needs to go in to v3.1-rc. Thanks, Kevin
On 09/06/2011 01:13 PM, Kevin Hilman wrote: > On 09/01/2011 02:57 PM, Rafael J. Wysocki wrote: >> On Thursday, September 01, 2011, Arnd Bergmann wrote: >>> On Thursday 01 September 2011 11:12:02 Kevin Hilman wrote: >>>> The suspend/resume _noirq handlers were #ifdef'd out in the >>>> !CONFIG_SUSPEND case, but were still assigned to the dev_pm_ops >>>> struct. Fix by defining them to NULL in the !CONFIG_SUSPEND case. >>>> >>>> Reported-by: Arnd Bergmann<arnd@arndb.de> >>>> Signed-off-by: Kevin Hilman<khilman@ti.com> >>> >>> Acked-by: Arnd Bergmann<arnd@arndb.de> >>> >>> Thansk for the fast response! >> >> I'll apply the patch when kernel.org is back in order. >> > > Tony, > > I spoke w/Rafael and due to hera being down and Rafael traveling to LPC > he wont be able to queue this for v3.1. Can you queue up this fix? This > needs to go in to v3.1-rc. For convenience, this patch is in a branch in my backup gitorious repo with Arnd's ack added: git://gitorious.org/khilman/linux-omap-pm.git for_3.1/pm-fixes-2 Kevin
diff --git a/arch/arm/plat-omap/omap_device.c b/arch/arm/plat-omap/omap_device.c index 9a6a538..02609ee 100644 --- a/arch/arm/plat-omap/omap_device.c +++ b/arch/arm/plat-omap/omap_device.c @@ -615,6 +615,9 @@ static int _od_resume_noirq(struct device *dev) return pm_generic_resume_noirq(dev); } +#else +#define _od_suspend_noirq NULL +#define _od_resume_noirq NULL #endif static struct dev_pm_domain omap_device_pm_domain = {
The suspend/resume _noirq handlers were #ifdef'd out in the !CONFIG_SUSPEND case, but were still assigned to the dev_pm_ops struct. Fix by defining them to NULL in the !CONFIG_SUSPEND case. Reported-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Kevin Hilman <khilman@ti.com> --- Applies to v3.1-rc4. arch/arm/plat-omap/omap_device.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)