diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-06-18 15:31:26 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-06-18 15:31:26 -0700 |
| commit | 25ebc2f42b07d5aab3b336f5970b8d52b00dd3e2 (patch) | |
| tree | 567e00b50e953f4eb23379cf488bbfef6574668b | |
| parent | cb3126e60ffc1b7658a6ff4f6874585098bf9887 (diff) | |
| parent | 2e04bb7b284198f26e129b03e03459a7045cb8b6 (diff) | |
| download | op-kernel-dev-25ebc2f42b07d5aab3b336f5970b8d52b00dd3e2.zip op-kernel-dev-25ebc2f42b07d5aab3b336f5970b8d52b00dd3e2.tar.gz | |
Merge branch 'staging-next' into work
| -rw-r--r-- | drivers/staging/winbond/phy_calibration.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/staging/winbond/phy_calibration.c b/drivers/staging/winbond/phy_calibration.c index 5eefea3..5c1f053 100644 --- a/drivers/staging/winbond/phy_calibration.c +++ b/drivers/staging/winbond/phy_calibration.c @@ -32,7 +32,7 @@ static const s32 Angles[] = { FIXED(DEG2RAD(0.111906)), FIXED(DEG2RAD(0.055953)), FIXED(DEG2RAD(0.027977)) }; -/****************** LOCAL FUNCTION DECLARATION SECTION ********************** +/****************** LOCAL FUNCTION DECLARATION SECTION **********************/ /* * void _phy_rf_write_delay(struct hw_data *phw_data); @@ -142,7 +142,6 @@ u32 _s32_to_s6(s32 data) data = 31; else if (data < -32) data = -32; - } val = data & 0x003F; @@ -1496,7 +1495,7 @@ void phy_calibration_winbond(struct hw_data *phw_data, u32 frequency) /******************/ void phy_set_rf_data(struct hw_data *pHwData, u32 index, u32 value) { - u32 ltmpi = 0; + u32 ltmp = 0; switch (pHwData->phy_type) { case RF_MAXIM_2825: |
