vcs.maemo.org Git - kernel-bfs/blob - kernel-bfs-2.6.28/debian/patches/shutdown-reboot-patch.diff

   1 --- kernel-power-2.6.28.orig/arch/arm/mach-omap2/pm.c   2011-11-23 11:17:07.555970502 +0000
   2 +++ kernel-power-2.6.28/arch/arm/mach-omap2/pm.c        2011-11-23 11:10:32.626825000 +0000
   3 @@ -322,6 +322,8 @@
   4                         resource_lock_opp(PRCM_VDD1);
   5                         vdd1_locked = 1;
   6                 }
   7 +               else
   8 +                       return n;
   9         } else if (attr == &vdd2_lock_attr) {
  10                 flags = OPP_IGNORE_LOCK;
  11                 attr = &vdd2_opp_attr;
  12 @@ -335,6 +337,8 @@
  13                         resource_lock_opp(PRCM_VDD2);
  14                         vdd2_locked = 1;
  15                 }
  16 +               else
  17 +                       return n;
  18         }
  19
  20         if (attr == &vdd1_opp_attr) {
  21 --- kernel-power-2.6.28.orig/drivers/usb/musb/omap2430.c        2011-11-23 11:17:06.856287549 +0000
  22 +++ kernel-power-2.6.28/drivers/usb/musb/omap2430.c     2011-11-22 19:17:27.367424000 +0000
  23 @@ -212,6 +212,7 @@
  24  }
  25
  26  static int musb_platform_resume(struct musb *musb);
  27 +static int musb_platform_suspend(struct musb *musb);
  28
  29  int musb_platform_set_mode(struct musb *musb, u8 musb_mode, u8 hostspeed)
  30  {
  31 @@ -254,6 +255,7 @@
  32                          musb_writeb(musb->mregs, MUSB_DEVCTL, devctl);
  33
  34                          musb_writeb(musb->mregs, MUSB_TESTMODE, 0);
  35 +                       musb_platform_suspend(musb);
  36                  }
  37
  38                 otg_set_peripheral(musb->xceiv, &musb->g);