diff options
author | Olof Johansson <olof@lixom.net> | 2012-11-05 09:50:33 -0800 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-11-05 09:50:33 -0800 |
commit | c2d8c259bfce056437e8dbc4b048944050f9b567 (patch) | |
tree | 726e49653f7014bea034c59624ea23c21d6df13f /drivers/net/wireless/rt2x00/rt2800lib.c | |
parent | e4de6c961cc8b688443c7989ae3e38d0518334a5 (diff) | |
parent | e5c5f2adeb370559f4b221d57214db85858b786a (diff) | |
download | talos-obmc-linux-c2d8c259bfce056437e8dbc4b048944050f9b567.tar.gz talos-obmc-linux-c2d8c259bfce056437e8dbc4b048944050f9b567.zip |
Merge branch 'devel/debug_ll_init' into next/multiplatform
* devel/debug_ll_init:
ARM: implement debug_ll_io_init()
+ sync to Linux 3.7-rc4
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2800lib.c')
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2800lib.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c index 01dc8891070c..59474ae0aec0 100644 --- a/drivers/net/wireless/rt2x00/rt2800lib.c +++ b/drivers/net/wireless/rt2x00/rt2800lib.c @@ -2449,7 +2449,7 @@ static int rt2800_get_gain_calibration_delta(struct rt2x00_dev *rt2x00dev) /* * Check if temperature compensation is supported. */ - if (tssi_bounds[4] == 0xff) + if (tssi_bounds[4] == 0xff || step == 0xff) return 0; /* |