diff --git a/[refs] b/[refs]
index 2c229e734cea..6af27ae55230 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b9e1c8e821e7768d5b8629ad7748456af6feece3
+refs/heads/master: f9c08e2acbbed19ecafc82e4549b7040cc549216
diff --git a/trunk/drivers/devfreq/devfreq.c b/trunk/drivers/devfreq/devfreq.c
index ac4334fac2c6..34c00c53611f 100644
--- a/trunk/drivers/devfreq/devfreq.c
+++ b/trunk/drivers/devfreq/devfreq.c
@@ -644,7 +644,7 @@ int devfreq_remove_governor(struct devfreq_governor *governor)
 	if (IS_ERR(g)) {
 		pr_err("%s: governor %s not registered\n", __func__,
 		       governor->name);
-		err = -EINVAL;
+		err = PTR_ERR(g);
 		goto err_out;
 	}
 	list_for_each_entry(devfreq, &devfreq_list, node) {