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

Commit 4263cf0f authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

Input: make input_register_handler() return error codes 



Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
parent 68c2a160

drivers/char/keyboard.c

+4 −1
Original line number Diff line number Diff line
@@ -1362,6 +1362,7 @@ static struct input_handler kbd_handler = { 
int __init kbd_init(void)

{

	int i;

	int error;



        for (i = 0; i < MAX_NR_CONSOLES; i++) {

		kbd_table[i].ledflagstate = KBD_DEFLEDS;
@@ -1373,7 +1374,9 @@ int __init kbd_init(void) 
		kbd_table[i].kbdmode = VC_XLATE;

	}



	input_register_handler(&kbd_handler);

	error = input_register_handler(&kbd_handler);

	if (error)

		return error;



	tasklet_enable(&keyboard_tasklet);

	tasklet_schedule(&keyboard_tasklet);

drivers/input/evbug.c

+1 −2
Original line number Diff line number Diff line
@@ -91,8 +91,7 @@ static struct input_handler evbug_handler = { 


static int __init evbug_init(void)

{

	input_register_handler(&evbug_handler);

	return 0;

	return input_register_handler(&evbug_handler);

}



static void __exit evbug_exit(void)

drivers/input/evdev.c

+1 −2
Original line number Diff line number Diff line
@@ -695,8 +695,7 @@ static struct input_handler evdev_handler = { 


static int __init evdev_init(void)

{

	input_register_handler(&evdev_handler);

	return 0;

	return input_register_handler(&evdev_handler);

}



static void __exit evdev_exit(void)

drivers/input/input.c

+7 −5
Original line number Diff line number Diff line
@@ -1037,19 +1037,20 @@ void input_unregister_device(struct input_dev *dev) 
}

EXPORT_SYMBOL(input_unregister_device);



void input_register_handler(struct input_handler *handler)

int input_register_handler(struct input_handler *handler)

{

	struct input_dev *dev;

	struct input_handle *handle;

	const struct input_device_id *id;



	if (!handler)

		return;



	INIT_LIST_HEAD(&handler->h_list);



	if (handler->fops != NULL)

	if (handler->fops != NULL) {

		if (input_table[handler->minor >> 5])

			return -EBUSY;



		input_table[handler->minor >> 5] = handler;

	}



	list_add_tail(&handler->node, &input_handler_list);
@@ -1063,6 +1064,7 @@ void input_register_handler(struct input_handler *handler) 
				}



	input_wakeup_procfs_readers();

	return 0;

}

EXPORT_SYMBOL(input_register_handler);

drivers/input/joydev.c

+1 −2
Original line number Diff line number Diff line
@@ -606,8 +606,7 @@ static struct input_handler joydev_handler = { 


static int __init joydev_init(void)

{

	input_register_handler(&joydev_handler);

	return 0;

	return input_register_handler(&joydev_handler);

}



static void __exit joydev_exit(void)