From: Mike McCormack <mikem@ring3k.org>
Date: Tue, 8 Mar 2011 15:40:33 +0000 (+0900)
Subject: staging: rtl8192e: Pass priv to rtl8192_init
X-Git-Tag: firefly_0821_release~7613^2~2197^2~206
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c62fdce2f78b7571e83954bb0aaabdd0e6880a82;p=firefly-linux-kernel-4.4.55.git

staging: rtl8192e: Pass priv to rtl8192_init

Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/staging/rtl8192e/r8192E_core.c b/drivers/staging/rtl8192e/r8192E_core.c
index 9bb5bbaef7b1..f742eb2628dc 100644
--- a/drivers/staging/rtl8192e/r8192E_core.c
+++ b/drivers/staging/rtl8192e/r8192E_core.c
@@ -2416,9 +2416,10 @@ static short rtl8192_get_channel_map(struct r8192_priv *priv)
 	return 0;
 }
 
-static short rtl8192_init(struct net_device *dev)
+static short rtl8192_init(struct r8192_priv *priv)
 {
-	struct r8192_priv *priv = ieee80211_priv(dev);
+	struct net_device *dev = priv->ieee80211->dev;
+
 	memset(&(priv->stats),0,sizeof(struct Stats));
 	rtl8192_init_priv_variable(priv);
 	rtl8192_init_priv_lock(priv);
@@ -4655,7 +4656,7 @@ static int __devinit rtl8192_pci_probe(struct pci_dev *pdev,
         }
 
 	RT_TRACE(COMP_INIT, "Driver probe completed1\n");
-	if(rtl8192_init(dev)!=0){
+	if (rtl8192_init(priv)!=0) {
 		RT_TRACE(COMP_ERR, "Initialization failed\n");
 		goto fail;
 	}