--- 810eafcb847bdb82ea378b79db022600a27180e3
+++ 5457720fbd510afb16d2ea187ff143a9505178a8
@@ -440,7 +440,7 @@ static void gpio_keys_gpio_work_func(str
 
 	gpio_keys_gpio_report_event(bdata);
 #ifdef KEY_BOOSTER
-	if (button->code == KEY_HOMEPAGE)
+	if (button->code == KEY_HOME)
 		gpio_key_set_dvfs_lock(bdata, !!state);
 #endif
 }
@@ -959,6 +959,10 @@ static int __devinit gpio_keys_probe(str
 		error = gpio_keys_setup_key(pdev, input, bdata, button);
 		if (error)
 			goto fail2;
+
+		if (button->wakeup)
+			wakeup = 1;
+	}
 #ifdef KEY_BOOSTER
 		error = gpio_key_init_dvfs(bdata);
 		if (error < 0) {
@@ -966,9 +970,6 @@ static int __devinit gpio_keys_probe(str
 			goto fail2;
 		}
 #endif
-		if (button->wakeup)
-			wakeup = 1;
-	}
 	error = sysfs_create_group(&pdev->dev.kobj, &gpio_keys_attr_group);
 	if (error) {
 		dev_err(dev, "Unable to export keys/switches, error: %d\n",