diff --git a/[refs] b/[refs]
index 29a12c649f5b..6057ae7d378d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 862c307fc1ccee9b8f67e1efe9d9b2be9fa2b42e
+refs/heads/master: 90b3b115e5ace1d414390526bb06b3109cfe8963
diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c b/trunk/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
index 1f736ead1bda..c4a8117a557b 100644
--- a/trunk/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
+++ b/trunk/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
@@ -251,7 +251,6 @@ static s32
 brcmf_dev_ioctl(struct net_device *dev, u32 cmd, void *arg, u32 len)
 {
 	struct brcmf_ioctl ioc;
-	mm_segment_t fs;
 	s32 err = 0;
 
 	memset(&ioc, 0, sizeof(ioc));
@@ -259,10 +258,7 @@ brcmf_dev_ioctl(struct net_device *dev, u32 cmd, void *arg, u32 len)
 	ioc.buf = arg;
 	ioc.len = len;
 
-	fs = get_fs();
-	set_fs(get_ds());
 	err = brcmf_netdev_ioctl_priv(dev, &ioc);
-	set_fs(fs);
 
 	return err;
 }