diff --git a/drivers/cpuquiet/driver.c b/drivers/cpuquiet/driver.c
index fb9912b86e5e..097d2e36b79d 100644
--- a/drivers/cpuquiet/driver.c
+++ b/drivers/cpuquiet/driver.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012 NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2012-2013 NVIDIA CORPORATION.  All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -197,10 +197,10 @@ void cpuquiet_unregister_driver(struct cpuquiet_driver *drv)
 		return;
 	}
 
-	/* stop current governor first */
-	cpuquiet_switch_governor(NULL);
-
 	mutex_lock(&cpuquiet_lock);
+
+	/* Stop current governor first */
+	cpuquiet_switch_governor(NULL);
 	cpuquiet_curr_driver = NULL;
 
 	for_each_possible_cpu(cpu) {