X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=kernel%2Flocking%2Flocktorture.c;h=820852f698583de63c72e3f4ee7760ad38c5b618;hb=a36a99618b1adb2d6ca0b7e08e3a656a04e477fe;hp=32244186f1f2ae0e7a6343ad084f416aa0cda055;hpb=4322f028477d4c84f12fa9aa21809300855ff953;p=deliverable%2Flinux.git

diff --git a/kernel/locking/locktorture.c b/kernel/locking/locktorture.c
index 32244186f1f2..820852f69858 100644
--- a/kernel/locking/locktorture.c
+++ b/kernel/locking/locktorture.c
@@ -661,11 +661,11 @@ static int __init lock_torture_init(void)
 		for (i = 0; i < ARRAY_SIZE(torture_ops); i++)
 			pr_alert(" %s", torture_ops[i]->name);
 		pr_alert("\n");
-		torture_init_end();
-		return -EINVAL;
+		firsterr = -EINVAL;
+		goto unwind;
 	}
 	if (cxt.cur_ops->init)
-		cxt.cur_ops->init(); /* no "goto unwind" prior to this point!!! */
+		cxt.cur_ops->init();
 
 	if (nwriters_stress >= 0)
 		cxt.nrealwriters_stress = nwriters_stress;