2 files changed, 2 insertions, 9 deletions

diff --git a/drivers/video/neofb.c b/drivers/video/neofb.c
index dea864552588..bfb802d26d5a 100644
--- a/drivers/video/neofb.c
+++ b/drivers/video/neofb.c
@@ -557,14 +557,12 @@ neofb_open(struct fb_info *info, int user)
 {
         struct neofb_par *par = info->par;
 
-        mutex_lock(&par->open_lock);
         if (!par->ref_count) {
                 memset(&par->state, 0, sizeof(struct vgastate));
                 par->state.flags = VGA_SAVE_MODE | VGA_SAVE_FONTS;
                 save_vga(&par->state);
         }
         par->ref_count++;
-        mutex_unlock(&par->open_lock);
 
         return 0;
 }
@@ -574,16 +572,13 @@ neofb_release(struct fb_info *info, int user)
 {
         struct neofb_par *par = info->par;
 
-        mutex_lock(&par->open_lock);
-        if (!par->ref_count) {
-                mutex_unlock(&par->open_lock);
+        if (!par->ref_count)
                 return -EINVAL;
-        }
+
         if (par->ref_count == 1) {
                 restore_vga(&par->state);
         }
         par->ref_count--;
-        mutex_unlock(&par->open_lock);
 
         return 0;
 }
@@ -1958,7 +1953,6 @@ static struct fb_info *__devinit neo_alloc_fb_info(struct pci_dev *dev, const st
 
         info->fix.accel = id->driver_data;
 
-        mutex_init(&par->open_lock);
         par->pci_burst = !nopciburst;
         par->lcd_stretch = !nostretch;
         par->libretto = libretto;
diff --git a/include/video/neomagic.h b/include/video/neomagic.h
index 38910da0ae59..08b663782956 100644
--- a/include/video/neomagic.h
+++ b/include/video/neomagic.h
@@ -123,7 +123,6 @@ typedef volatile struct {
 
 struct neofb_par {
         struct vgastate state;
-        struct mutex open_lock;
         unsigned int ref_count;
 
         unsigned char MiscOutReg;       /* Misc */