Samsung SPH-L720 (Sprint) source updates
/drivers/input/keyboard/gpio_keys.c
blob:9d25be4884318aa078f66ae8e12093cff018a819 -> blob:810eafcb847bdb82ea378b79db022600a27180e3
--- drivers/input/keyboard/gpio_keys.c
+++ drivers/input/keyboard/gpio_keys.c
@@ -43,7 +43,7 @@ struct gpio_button_data {
spinlock_t lock;
bool disabled;
bool key_pressed;
- #ifdef KEY_BOOSTER
+#ifdef KEY_BOOSTER
struct delayed_work work_dvfs_off;
struct delayed_work work_dvfs_chg;
bool dvfs_lock_status;
@@ -435,11 +435,12 @@ static void gpio_keys_gpio_work_func(str
{
struct gpio_button_data *bdata =
container_of(work, struct gpio_button_data, work);
-const struct gpio_keys_button *button = bdata->button;
-int state = (gpio_get_value_cansleep(button->gpio) ? 1 : 0) ^ button->active_low;
+ const struct gpio_keys_button *button = bdata->button;
+ int state = (gpio_get_value_cansleep(button->gpio) ? 1 : 0) ^ button->active_low;
+
gpio_keys_gpio_report_event(bdata);
- #ifdef KEY_BOOSTER
- if (button->code == KEY_HOME)
+#ifdef KEY_BOOSTER
+ if (button->code == KEY_HOMEPAGE)
gpio_key_set_dvfs_lock(bdata, !!state);
#endif
}
@@ -958,10 +959,6 @@ 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) {
@@ -969,6 +966,9 @@ 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",