diff --git a/[refs] b/[refs]
index 5608c077accc..754c245b12cc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 35be8425384df44a819413ed238287586219d579
+refs/heads/master: 24d8e51ef3671f7dff0aaee0f3cf4c55d33c7292
diff --git a/trunk/drivers/staging/comedi/comedi_fops.c b/trunk/drivers/staging/comedi/comedi_fops.c
index 3e82ab9bc51b..dc3588a2c98b 100644
--- a/trunk/drivers/staging/comedi/comedi_fops.c
+++ b/trunk/drivers/staging/comedi/comedi_fops.c
@@ -58,7 +58,7 @@ MODULE_PARM_DESC(comedi_debug,
 		);
 #endif
 
-bool comedi_autoconfig = 1;
+bool comedi_autoconfig = true;
 module_param(comedi_autoconfig, bool, S_IRUGO);
 MODULE_PARM_DESC(comedi_autoconfig,
 		 "enable drivers to auto-configure comedi devices (default 1)");
@@ -2437,7 +2437,7 @@ static int __init comedi_init(void)
 	 * comedi_num_legacy_minors are zero, so we might as well adjust the
 	 * defaults in that case
 	 */
-	if (comedi_autoconfig == 0 && comedi_num_legacy_minors == 0)
+	if (!comedi_autoconfig && comedi_num_legacy_minors == 0)
 		comedi_num_legacy_minors = 16;
 
 	memset(comedi_file_info_table, 0,