RK3368 Mailbox: add mailbox version information

[firefly-linux-kernel-4.4.55.git] / drivers / input / keyreset.c

diff --git a/drivers/input/keyreset.c b/drivers/input/keyreset.c
index eaaccde8221013c4faec1ef932732d463139136f..7fbf7247e65f5879faa006d19340d8711dc34883 100644 (file)
--- a/drivers/input/keyreset.c
+++ b/drivers/input/keyreset.c
@@ -27,9 +27,10 @@ struct keyreset_state {
        int restart_requested;
        int (*reset_fn)(void);
        struct platform_device *pdev_child;
+       struct work_struct restart_work;
 };
 
-static void do_restart(void)
+static void do_restart(struct work_struct *unused)
 {
        sys_sync();
        kernel_restart(NULL);
@@ -44,7 +45,7 @@ static void do_reset_fn(void *priv)
                state->restart_requested = state->reset_fn();
        } else {
                pr_info("keyboard reset\n");
-               do_restart();
+               schedule_work(&state->restart_work);
                state->restart_requested = 1;
        }
 }
@@ -69,6 +70,7 @@ static int keyreset_probe(struct platform_device *pdev)
        if (!state->pdev_child)
                return -ENOMEM;
        state->pdev_child->dev.parent = &pdev->dev;
+       INIT_WORK(&state->restart_work, do_restart);
 
        keyp = pdata->keys_down;
        while ((key = *keyp++)) {