From ee70fe167c2b3bd5164195bd84d614c562e612de Mon Sep 17 00:00:00 2001
From: Alessio Igor Bogani <abogani@texware.it>
Date: Tue, 31 Mar 2009 15:25:46 -0700
Subject: [PATCH] --- yaml --- r: 139295 b: refs/heads/master c:
 98da329581e3e6a08eba418ba6da64c05bacd029 h: refs/heads/master i:   139293:
 855fb7c881b72a4f4af5baffc81cba95af337d1b   139291:
 13e0bb008e36b6a9a0d526807a284085df41a7b6   139287:
 564abfefe4508295ffe8b10e17acb3fec21cda5b   139279:
 8280a92acde6dfebe4ea2c6bf191347eaee3788d   139263:
 78d0ae86fae40371c332f42aaab3a939df3e8856 v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/video/nvidia/nv_type.h | 2 --
 trunk/drivers/video/nvidia/nvidia.c  | 7 -------
 3 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index a80002bfa7a8..941e327b7f52 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 18b41f1cd537168a886c43237297692ba8d0a143
+refs/heads/master: 98da329581e3e6a08eba418ba6da64c05bacd029
diff --git a/trunk/drivers/video/nvidia/nv_type.h b/trunk/drivers/video/nvidia/nv_type.h
index f132aab8c5de..c03f7f55c76d 100644
--- a/trunk/drivers/video/nvidia/nv_type.h
+++ b/trunk/drivers/video/nvidia/nv_type.h
@@ -5,7 +5,6 @@
 #include <linux/types.h>
 #include <linux/i2c.h>
 #include <linux/i2c-algo-bit.h>
-#include <linux/mutex.h>
 #include <video/vga.h>
 
 #define NV_ARCH_04  0x04
@@ -99,7 +98,6 @@ struct nvidia_par {
 	RIVA_HW_STATE initial_state;
 	RIVA_HW_STATE *CurrentState;
 	struct vgastate vgastate;
-	struct mutex open_lock;
 	u32 pseudo_palette[16];
 	struct pci_dev *pci_dev;
 	u32 Architecture;
diff --git a/trunk/drivers/video/nvidia/nvidia.c b/trunk/drivers/video/nvidia/nvidia.c
index 9dbb5a5a267b..efe10ff86d63 100644
--- a/trunk/drivers/video/nvidia/nvidia.c
+++ b/trunk/drivers/video/nvidia/nvidia.c
@@ -1004,15 +1004,12 @@ static int nvidiafb_open(struct fb_info *info, int user)
 {
 	struct nvidia_par *par = info->par;
 
-	mutex_lock(&par->open_lock);
-
 	if (!par->open_count) {
 		save_vga_x86(par);
 		nvidia_save_vga(par, &par->initial_state);
 	}
 
 	par->open_count++;
-	mutex_unlock(&par->open_lock);
 	return 0;
 }
 
@@ -1021,8 +1018,6 @@ static int nvidiafb_release(struct fb_info *info, int user)
 	struct nvidia_par *par = info->par;
 	int err = 0;
 
-	mutex_lock(&par->open_lock);
-
 	if (!par->open_count) {
 		err = -EINVAL;
 		goto done;
@@ -1035,7 +1030,6 @@ static int nvidiafb_release(struct fb_info *info, int user)
 
 	par->open_count--;
 done:
-	mutex_unlock(&par->open_lock);
 	return err;
 }
 
@@ -1300,7 +1294,6 @@ static int __devinit nvidiafb_probe(struct pci_dev *pd,
 
 	par = info->par;
 	par->pci_dev = pd;
-	mutex_init(&par->open_lock);
 	info->pixmap.addr = kzalloc(8 * 1024, GFP_KERNEL);
 
 	if (info->pixmap.addr == NULL)