aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/wireless/hostap/hostap_ap.c2
-rw-r--r--sound/soc/imx/imx-ssi.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/hostap/hostap_ap.c b/drivers/net/wireless/hostap/hostap_ap.c
index 231dbd77f5f5..cb3c25f0c190 100644
--- a/drivers/net/wireless/hostap/hostap_ap.c
+++ b/drivers/net/wireless/hostap/hostap_ap.c
@@ -1225,7 +1225,7 @@ static void ap_crypt_init(struct ap_data *ap)
1225 1225
1226 1226
1227/* Generate challenge data for shared key authentication. IEEE 802.11 specifies 1227/* Generate challenge data for shared key authentication. IEEE 802.11 specifies
1228 * that WEP algorithm is used for generating challange. This should be unique, 1228 * that WEP algorithm is used for generating challenge. This should be unique,
1229 * but otherwise there is not really need for randomness etc. Initialize WEP 1229 * but otherwise there is not really need for randomness etc. Initialize WEP
1230 * with pseudo random key and then use increasing IV to get unique challenge 1230 * with pseudo random key and then use increasing IV to get unique challenge
1231 * streams. 1231 * streams.
diff --git a/sound/soc/imx/imx-ssi.c b/sound/soc/imx/imx-ssi.c
index 80b4fee2442b..4fd13d0791b8 100644
--- a/sound/soc/imx/imx-ssi.c
+++ b/sound/soc/imx/imx-ssi.c
@@ -23,7 +23,7 @@
23 * between pcm data and GPIO status data changes. Our FIQ handler is not 23 * between pcm data and GPIO status data changes. Our FIQ handler is not
24 * able to handle this, hence this driver only works with 48000Hz sampling 24 * able to handle this, hence this driver only works with 48000Hz sampling
25 * rate. 25 * rate.
26 * Reading and writing AC97 registers is another challange. The core 26 * Reading and writing AC97 registers is another challenge. The core
27 * provides us status bits when the read register is updated with *another* 27 * provides us status bits when the read register is updated with *another*
28 * value. When we read the same register two times (and the register still 28 * value. When we read the same register two times (and the register still
29 * contains the same value) these status bits are not set. We work 29 * contains the same value) these status bits are not set. We work