diff --git a/[refs] b/[refs]
index 4979ede50288..bd98b2a8c907 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cae1c11414912bf77a62aebd65ced321f0b9da51
+refs/heads/master: d409f3bf47c5e5ae10601d079204e263bc176bcf
diff --git a/trunk/drivers/usb/wusbcore/crypto.c b/trunk/drivers/usb/wusbcore/crypto.c
index c36c4389baae..0ca860305feb 100644
--- a/trunk/drivers/usb/wusbcore/crypto.c
+++ b/trunk/drivers/usb/wusbcore/crypto.c
@@ -54,6 +54,10 @@
 #define D_LOCAL 0
 #include <linux/uwb/debug.h>
 
+static int debug_crypto_verify = 0;
+
+module_param(debug_crypto_verify, int, 0);
+MODULE_PARM_DESC(debug_crypto_verify, "verify the key generation algorithms");
 
 /*
  * Block of data, as understood by AES-CCM
@@ -526,10 +530,13 @@ int wusb_crypto_init(void)
 {
 	int result;
 
-	result = wusb_key_derive_verify();
-	if (result < 0)
-		return result;
-	return wusb_oob_mic_verify();
+	if (debug_crypto_verify) {
+		result = wusb_key_derive_verify();
+		if (result < 0)
+			return result;
+		return wusb_oob_mic_verify();
+	}
+	return 0;
 }
 
 void wusb_crypto_exit(void)