Merge branch 'topic/oss' into for-linus

[pandora-kernel.git] / drivers / net / wireless / libertas / 11d.c

diff --git a/drivers/net/wireless/libertas/11d.c b/drivers/net/wireless/libertas/11d.c
index 9a5408e..5c69681 100644 (file)
--- 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++) {