From 01d29604d2e1e48ad40d6d5d3c330f5a599ff968 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Pali=20Roh=C3=A1r?= Date: Wed, 23 Nov 2011 20:27:24 +0100 Subject: [PATCH] Fixed bug when device restarts instead of shutdown when a charger is attached * Patch by freemangordon --- kernel-power-2.6.28/debian/patches/series | 1 + .../debian/patches/shutdown-reboot-patch.diff | 38 ++++++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 kernel-power-2.6.28/debian/patches/shutdown-reboot-patch.diff diff --git a/kernel-power-2.6.28/debian/patches/series b/kernel-power-2.6.28/debian/patches/series index 6c49aed..26affdd 100644 --- a/kernel-power-2.6.28/debian/patches/series +++ b/kernel-power-2.6.28/debian/patches/series @@ -55,3 +55,4 @@ update_mmu_cache_arm.diff radio-si4713.diff overclock_smartreflex_900.diff dspbridge.diff +shutdown-reboot-patch.diff diff --git a/kernel-power-2.6.28/debian/patches/shutdown-reboot-patch.diff b/kernel-power-2.6.28/debian/patches/shutdown-reboot-patch.diff new file mode 100644 index 0000000..2c02904 --- /dev/null +++ b/kernel-power-2.6.28/debian/patches/shutdown-reboot-patch.diff @@ -0,0 +1,38 @@ +--- kernel-power-2.6.28.orig/arch/arm/mach-omap2/pm.c 2011-11-23 11:17:07.555970502 +0000 ++++ kernel-power-2.6.28/arch/arm/mach-omap2/pm.c 2011-11-23 11:10:32.626825000 +0000 +@@ -322,6 +322,8 @@ + resource_lock_opp(PRCM_VDD1); + vdd1_locked = 1; + } ++ else ++ return n; + } else if (attr == &vdd2_lock_attr) { + flags = OPP_IGNORE_LOCK; + attr = &vdd2_opp_attr; +@@ -335,6 +337,8 @@ + resource_lock_opp(PRCM_VDD2); + vdd2_locked = 1; + } ++ else ++ return n; + } + + if (attr == &vdd1_opp_attr) { +--- kernel-power-2.6.28.orig/drivers/usb/musb/omap2430.c 2011-11-23 11:17:06.856287549 +0000 ++++ kernel-power-2.6.28/drivers/usb/musb/omap2430.c 2011-11-22 19:17:27.367424000 +0000 +@@ -212,6 +212,7 @@ + } + + static int musb_platform_resume(struct musb *musb); ++static int musb_platform_suspend(struct musb *musb); + + int musb_platform_set_mode(struct musb *musb, u8 musb_mode, u8 hostspeed) + { +@@ -254,6 +255,7 @@ + musb_writeb(musb->mregs, MUSB_DEVCTL, devctl); + + musb_writeb(musb->mregs, MUSB_TESTMODE, 0); ++ musb_platform_suspend(musb); + } + + otg_set_peripheral(musb->xceiv, &musb->g); -- 1.7.9.5