diff options
| author | David S. Miller <davem@davemloft.net> | 2009-08-03 19:05:50 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-08-03 19:05:50 -0700 |
| commit | eca4c3d2dd66d0230140c9af05dee591df6f0e42 (patch) | |
| tree | 59167ea2ac39a78f626bb3905e495963af326b77 /drivers/net/wireless/libertas/11d.c | |
| parent | f6caa14aa0b126d4a2933907d1519611b2a8524a (diff) | |
| parent | 99f1b01562b7dcae75b043114f76163fbf84fcab (diff) | |
| download | op-kernel-dev-eca4c3d2dd66d0230140c9af05dee591df6f0e42.zip op-kernel-dev-eca4c3d2dd66d0230140c9af05dee591df6f0e42.tar.gz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/libertas/11d.c')
| -rw-r--r-- | drivers/net/wireless/libertas/11d.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/libertas/11d.c b/drivers/net/wireless/libertas/11d.c index 9a5408e..5c69681 100644 --- a/drivers/net/wireless/libertas/11d.c +++ b/drivers/net/wireless/libertas/11d.c @@ -47,7 +47,7 @@ static u8 lbs_region_2_code(u8 *region) { u8 i; - for (i = 0; region[i] && i < COUNTRY_CODE_LEN; i++) + for (i = 0; i < COUNTRY_CODE_LEN && region[i]; i++) region[i] = toupper(region[i]); for (i = 0; i < ARRAY_SIZE(region_code_mapping); i++) { |
