aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/rtl8192e
diff options
context:
space:
mode:
authorMike McCormack <mikem@ring3k.org>2011-03-08 10:40:33 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2011-03-09 18:46:28 -0500
commitc62fdce2f78b7571e83954bb0aaabdd0e6880a82 (patch)
tree0dcde63a33df46144bababea2c4b2eb90e454cba /drivers/staging/rtl8192e
parent679a2494fbe357dc81c97a6097d70e53cd2e5b3f (diff)
staging: rtl8192e: Pass priv to rtl8192_init
Signed-off-by: Mike McCormack <mikem@ring3k.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/rtl8192e')
-rw-r--r--drivers/staging/rtl8192e/r8192E_core.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/staging/rtl8192e/r8192E_core.c b/drivers/staging/rtl8192e/r8192E_core.c
index 9bb5bbaef7b..f742eb2628d 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)
2416 return 0; 2416 return 0;
2417} 2417}
2418 2418
2419static short rtl8192_init(struct net_device *dev) 2419static short rtl8192_init(struct r8192_priv *priv)
2420{ 2420{
2421 struct r8192_priv *priv = ieee80211_priv(dev); 2421 struct net_device *dev = priv->ieee80211->dev;
2422
2422 memset(&(priv->stats),0,sizeof(struct Stats)); 2423 memset(&(priv->stats),0,sizeof(struct Stats));
2423 rtl8192_init_priv_variable(priv); 2424 rtl8192_init_priv_variable(priv);
2424 rtl8192_init_priv_lock(priv); 2425 rtl8192_init_priv_lock(priv);
@@ -4655,7 +4656,7 @@ static int __devinit rtl8192_pci_probe(struct pci_dev *pdev,
4655 } 4656 }
4656 4657
4657 RT_TRACE(COMP_INIT, "Driver probe completed1\n"); 4658 RT_TRACE(COMP_INIT, "Driver probe completed1\n");
4658 if(rtl8192_init(dev)!=0){ 4659 if (rtl8192_init(priv)!=0) {
4659 RT_TRACE(COMP_ERR, "Initialization failed\n"); 4660 RT_TRACE(COMP_ERR, "Initialization failed\n");
4660 goto fail; 4661 goto fail;
4661 } 4662 }