Merge branch 'bkl-removal' of git://git.lwn.net/linux-2.6

* 'bkl-removal' of git://git.lwn.net/linux-2.6: (146 commits)
  IB/umad: BKL is not needed for ib_umad_open()
  IB/uverbs: BKL is not needed for ib_uverbs_open()
  bf561-coreb: BKL unneeded for open()
  Call fasync() functions without the BKL
  snd/PCM: fasync BKL pushdown
  ipmi: fasync BKL pushdown
  ecryptfs: fasync BKL pushdown
  Bluetooth VHCI: fasync BKL pushdown
  tty_io: fasync BKL pushdown
  tun: fasync BKL pushdown
  i2o: fasync BKL pushdown
  mpt: fasync BKL pushdown
  Remove BKL from remote_llseek v2
  Make FAT users happier by not deadlocking
  x86-mce: BKL pushdown
  vmwatchdog: BKL pushdown
  vmcp: BKL pushdown
  via-pmu: BKL pushdown
  uml-random: BKL pushdown
  uml-mmapper: BKL pushdown
  ...

1 files changed, 11 insertions, 4 deletions

diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
index 776f7fcd2fbf..33ebdb198daf 100644
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
@@ -1326,20 +1326,27 @@ fb_open(struct inode *inode, struct file *file)
 
         if (fbidx >= FB_MAX)
                 return -ENODEV;
+        lock_kernel();
 #ifdef CONFIG_KMOD
         if (!(info = registered_fb[fbidx]))
                 try_to_load(fbidx);
 #endif /* CONFIG_KMOD */
-        if (!(info = registered_fb[fbidx]))
-                return -ENODEV;
-        if (!try_module_get(info->fbops->owner))
-                return -ENODEV;
+        if (!(info = registered_fb[fbidx])) {
+                res = -ENODEV;
+                goto out;
+        }
+        if (!try_module_get(info->fbops->owner)) {
+                res = -ENODEV;
+                goto out;
+        }
         file->private_data = info;
         if (info->fbops->fb_open) {
                 res = info->fbops->fb_open(info,1);
                 if (res)
                         module_put(info->fbops->owner);
         }
+out:
+        unlock_kernel();
         return res;
 }