From c1b725b0acdfa07983c0675c806d9b7c4cf98493 Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Sun, 23 Nov 2008 20:09:54 +0100 Subject: [PATCH] --- yaml --- r: 119619 b: refs/heads/master c: 020cf6ba7a91ccc5db359f91e9abba175fd3a0aa h: refs/heads/master i: 119617: 2f4e66435155b916032e9d8e51abf8951fef1917 119615: bf4ce5efccfdee0f41c0a9815ee6e0a553fd25dc v: v3 --- [refs] | 2 +- trunk/net/wireless/reg.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 1bc7b9f10fb9..ad24da944f4d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 02969b38e6f7cef80e71d673d1e512e029a7009f +refs/heads/master: 020cf6ba7a91ccc5db359f91e9abba175fd3a0aa diff --git a/trunk/net/wireless/reg.c b/trunk/net/wireless/reg.c index 626dbb688499..eb3b1a9f9b12 100644 --- a/trunk/net/wireless/reg.c +++ b/trunk/net/wireless/reg.c @@ -343,9 +343,9 @@ static int ignore_request(struct wiphy *wiphy, enum reg_set_by set_by, return 0; return -EALREADY; } - if (WARN_ON(!is_alpha2_set(alpha2) || !is_an_alpha2(alpha2)), + if (WARN(!is_alpha2_set(alpha2) || !is_an_alpha2(alpha2), "Invalid Country IE regulatory hint passed " - "to the wireless core\n") + "to the wireless core\n")) return -EINVAL; /* We ignore Country IE hints for now, as we haven't yet * added the dot11MultiDomainCapabilityEnabled flag