From 0e44a1659f30ea724f3c22efbd89dfc92ab25023 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Mon, 5 Jan 2009 15:23:19 -0800
Subject: [PATCH] --- yaml --- r: 126754 b: refs/heads/master c:
 5a501b3011095c9afb396cdade5be8db359df977 h: refs/heads/master v: v3

---
 [refs]                                    |  2 +-
 trunk/drivers/staging/rt2870/rt_profile.c | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 2a7a2c300f1e..c0752c2f1d2c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c55519ff75224222f4668c92ae3733059269f575
+refs/heads/master: 5a501b3011095c9afb396cdade5be8db359df977
diff --git a/trunk/drivers/staging/rt2870/rt_profile.c b/trunk/drivers/staging/rt2870/rt_profile.c
index 3e360c661589..c4474a6428ac 100644
--- a/trunk/drivers/staging/rt2870/rt_profile.c
+++ b/trunk/drivers/staging/rt2870/rt_profile.c
@@ -925,9 +925,11 @@ NDIS_STATUS	RTMPReadParametersHook(
 
 	// Save uid and gid used for filesystem access.
 	// Set user and group to 0 (root)
-	orgfsuid = current->fsuid;
-	orgfsgid = current->fsgid;
-	current->fsuid=current->fsgid = 0;
+	orgfsuid = current_fsuid();
+	orgfsgid = current_fsgid();
+	/* Hm, can't really do this nicely anymore, so rely on these files
+	 * being set to the proper permission to read them... */
+	/* current->cred->fsuid = current->cred->fsgid = 0; */
     orgfs = get_fs();
     set_fs(KERNEL_DS);
 
@@ -1590,8 +1592,10 @@ NDIS_STATUS	RTMPReadParametersHook(
 	}
 
 	set_fs(orgfs);
+#if 0
 	current->fsuid = orgfsuid;
 	current->fsgid = orgfsgid;
+#endif
 
 	kfree(buffer);
 	kfree(tmpbuf);