wireless: make regdom passing semantics simpler

[pandora-kernel.git] / Documentation / networking / regulatory.txt

diff --git a/Documentation/networking/regulatory.txt b/Documentation/networking/regulatory.txt
index a96989a..357d4ba 100644 (file)
--- a/Documentation/networking/regulatory.txt
+++ b/Documentation/networking/regulatory.txt
@@ -167,7 +167,6 @@ struct ieee80211_regdomain mydriver_jp_regdom = {
 
 Then in some part of your code after your wiphy has been registered:
 
-       int r;
        struct ieee80211_regdomain *rd;
        int size_of_regd;
        int num_rules = mydriver_jp_regdom.n_reg_rules;
@@ -178,17 +177,11 @@ Then in some part of your code after your wiphy has been registered:
 
        rd = kzalloc(size_of_regd, GFP_KERNEL);
        if (!rd)
-       return -ENOMEM;
+               return -ENOMEM;
 
        memcpy(rd, &mydriver_jp_regdom, sizeof(struct ieee80211_regdomain));
 
-       for (i=0; i < num_rules; i++) {
+       for (i=0; i < num_rules; i++)
                memcpy(&rd->reg_rules[i], &mydriver_jp_regdom.reg_rules[i],
                        sizeof(struct ieee80211_reg_rule));
-       }
-       r = regulatory_hint(hw->wiphy, NULL, rd);
-       if (r) {
-               kfree(rd);
-               return r;
-       }
-
+       return regulatory_hint(hw->wiphy, NULL, rd);