git.maemo.org Git - kernel-bfs/blob - kernel-bfs-2.6.28/debian/patches/fmtx_lock_power.diff

   1 ---
   2  drivers/media/radio/radio-si4713.c |   58 +------------------------------------
   3  1 files changed, 3 insertions(+), 55 deletions(-)
   4
   5 Index: kernel-power-2.6.28/drivers/media/radio/radio-si4713.c
   6 ===================================================================
   7 --- kernel-power-2.6.28.orig/drivers/media/radio/radio-si4713.c
   8 +++ kernel-power-2.6.28/drivers/media/radio/radio-si4713.c
   9 @@ -200,8 +200,8 @@
  10
  11         sscanf(buf, "%d", &l);
  12
  13 -//     if (l != 0)
  14 -//             config_locked = 1;
  15 +       if (l != 0)
  16 +               config_locked = 1;
  17
  18         return count;
  19  }
  20 @@ -468,59 +468,7 @@
  21         if (cmd != LOCK_LOW_POWER && cmd != RELEASE_LOW_POWER)
  22                 return video_ioctl2(inode, file, cmd, arg);
  23
  24 -       pl = si4713_get_power_level(si4713_dev);
  25 -
  26 -       if (pl < 0) {
  27 -               rval = pl;
  28 -               goto exit;
  29 -       }
  30 -
  31 -       if (copy_from_user(&pow, (void __user *)arg, sizeof(pow))) {
  32 -               rval = -EFAULT;
  33 -               goto exit;
  34 -       }
  35 -
  36 -       if (cmd == LOCK_LOW_POWER) {
  37 -
  38 -               if (pid_count == APP_MAX_NUM) {
  39 -                       rval = -EPERM;
  40 -                       goto exit;
  41 -               }
  42 -
  43 -               if (pid_count == 0) {
  44 -                       if (pow > pl) {
  45 -                               rval = -EINVAL;
  46 -                               goto exit;
  47 -                       } else {
  48 -                               /* Set max possible power level */
  49 -                               max_pl = pl;
  50 -                               min_pl = pow;
  51 -                       }
  52 -               }
  53 -
  54 -               rval = register_pid(current->pid);
  55 -
  56 -               if (rval)
  57 -                       goto exit;
  58 -
  59 -               /* Lower min power level if asked */
  60 -               if (pow < min_pl)
  61 -                       min_pl = pow;
  62 -               else
  63 -                       pow = min_pl;
  64 -
  65 -       } else { /* RELEASE_LOW_POWER */
  66 -               rval = unregister_pid(current->pid);
  67 -
  68 -               if (rval)
  69 -                       goto exit;
  70 -
  71 -               if (pid_count == 0) {
  72 -                       if (pow > max_pl)
  73 -                               pow = max_pl;
  74 -               }
  75 -       }
  76 -       rval = si4713_set_power_level(si4713_dev, pow);
  77 +       rval = 0;
  78  exit:
  79         return rval;
  80  }