Merge remote-tracking branch 'staging/staging-next'

[deliverable/linux.git] / drivers / staging / rtl8192e / rtl8192e / rtl_ps.c

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_ps.c b/drivers/staging/rtl8192e/rtl8192e/rtl_ps.c
index 98e4d88d0e738ea9d5af8a28bd472c4fd13ccd61..aa4b015c3cc787449807c0a4f7a09535e4c1e327 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_ps.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_ps.c
@@ -179,9 +179,9 @@ void rtl92e_ips_leave_wq(void *data)
        struct net_device *dev = ieee->dev;
        struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev);
 
-       down(&priv->rtllib->ips_sem);
+       mutex_lock(&priv->rtllib->ips_mutex);
        rtl92e_ips_leave(dev);
-       up(&priv->rtllib->ips_sem);
+       mutex_unlock(&priv->rtllib->ips_mutex);
 }
 
 void rtl92e_rtllib_ips_leave_wq(struct net_device *dev)
@@ -209,9 +209,9 @@ void rtl92e_rtllib_ips_leave(struct net_device *dev)
 {
        struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev);
 
-       down(&priv->rtllib->ips_sem);
+       mutex_lock(&priv->rtllib->ips_mutex);
        rtl92e_ips_leave(dev);
-       up(&priv->rtllib->ips_sem);
+       mutex_unlock(&priv->rtllib->ips_mutex);
 }
 
 static bool _rtl92e_ps_set_mode(struct net_device *dev, u8 rtPsMode)