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

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

diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c
index 5e3bbe5c3ca499f63da7566ade3356dbf9d159d4..dde4922614511adfcd73af7865ce14487aa98362 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c
@@ -256,7 +256,7 @@ u32 rtl92e_get_rf_reg(struct net_device *dev, enum rf90_radio_path eRFPath,
                return 0;
        if (priv->rtllib->eRFPowerState != eRfOn && !priv->being_init_adapter)
                return  0;
-       down(&priv->rf_sem);
+       mutex_lock(&priv->rf_mutex);
        if (priv->Rf_Mode == RF_OP_By_FW) {
                Original_Value = _rtl92e_phy_rf_fw_read(dev, eRFPath, RegAddr);
                udelay(200);
@@ -265,7 +265,7 @@ u32 rtl92e_get_rf_reg(struct net_device *dev, enum rf90_radio_path eRFPath,
        }
        BitShift =  _rtl92e_calculate_bit_shift(BitMask);
        Readback_Value = (Original_Value & BitMask) >> BitShift;
-       up(&priv->rf_sem);
+       mutex_unlock(&priv->rf_mutex);
        return Readback_Value;
 }
 
@@ -630,7 +630,7 @@ void rtl92e_set_tx_power(struct net_device *dev, u8 channel)
 {
        struct r8192_priv *priv = rtllib_priv(dev);
        u8      powerlevel = 0, powerlevelOFDM24G = 0;
-       char ant_pwr_diff;
+       s8      ant_pwr_diff;
        u32     u4RegValue;
 
        if (priv->epromtype == EEPROM_93C46) {