diff --git a/[refs] b/[refs]
index f292ea8fd802..0e87d43ae72c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3346b798f202bf2f5b5272870ecdb75acec2e752
+refs/heads/master: f5b31e15acd1ab2fd9b9022c29a66f4625fa5658
diff --git a/trunk/drivers/staging/comedi/drivers.c b/trunk/drivers/staging/comedi/drivers.c
index 29c8f5037065..5a506a5bab68 100644
--- a/trunk/drivers/staging/comedi/drivers.c
+++ b/trunk/drivers/staging/comedi/drivers.c
@@ -452,7 +452,7 @@ int comedi_auto_config(struct device *hardware_device,
 	mutex_unlock(&comedi_dev->mutex);
 
 	if (ret < 0)
-		comedi_free_board_minor(minor);
+		comedi_release_hardware_device(hardware_device);
 	return ret;
 }
 EXPORT_SYMBOL_GPL(comedi_auto_config);