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

Commit 83c5aac1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: add KEY_RFKILL
  Input: i8042 - fix KBC jam during hibernate
parents 2fa298cf 3b77fd8e

drivers/input/serio/i8042.c

+8 −0
Original line number Diff line number Diff line
@@ -1161,9 +1161,17 @@ static int i8042_pm_restore(struct device *dev) 
	return 0;

}



static int i8042_pm_thaw(struct device *dev)

{

	i8042_interrupt(0, NULL);



	return 0;

}



static const struct dev_pm_ops i8042_pm_ops = {

	.suspend	= i8042_pm_reset,

	.resume		= i8042_pm_restore,

	.thaw		= i8042_pm_thaw,

	.poweroff	= i8042_pm_reset,

	.restore	= i8042_pm_restore,

};

include/linux/input.h

+1 −0
Original line number Diff line number Diff line
@@ -376,6 +376,7 @@ struct input_absinfo { 
#define KEY_DISPLAY_OFF		245	/* display device to off state */



#define KEY_WIMAX		246

#define KEY_RFKILL		247	/* Key that controls all radios */



/* Range 248 - 255 is reserved for special needs of AT keyboard driver */