Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 455a52a0 authored by Daniel Rosenberg's avatar Daniel Rosenberg Committed by Dmitry Shmidt
Browse files

ANDROID: input: Made keyreset more robust 



Switched do_restart to run in a seperate workqueue to  handle
cases where kernel_restart hangs.

Change-Id: I1ecd61f8d0859f1a86d37c692351d644b5db9c69
Signed-off-by: default avatarDaniel Rosenberg <drosen@google.com>
parent 6e92697b

drivers/input/keyreset.c

+4 −2
Original line number Diff line number Diff line
@@ -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++)) {