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

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

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c b/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c
index 803c8b02a0c81a3eb9c0a7bfa5215a6e4737b1f1..30f65af4d614635675077ea6d00fcf052978093f 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c
@@ -107,9 +107,9 @@ void rtl92e_set_key(struct net_device *dev, u8 EntryNo, u8 KeyIndex,
                                            __func__);
                                return;
                        }
-                       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);
                }
        }
        priv->rtllib->is_set_key = true;