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

Commit 5743695b 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: lifebook - fix settings for CF-72
  Input: psmouse - fix breakage introduced by b7802c5c
parents 8a1eaa6a b1e69aae

drivers/input/mouse/lifebook.c

+1 −2
Original line number Diff line number Diff line
@@ -107,8 +107,7 @@ static const struct dmi_system_id lifebook_dmi_table[] = { 
		.matches = {

			DMI_MATCH(DMI_PRODUCT_NAME, "CF-72"),

		},

		.callback = lifebook_set_serio_phys,

		.driver_data = "isa0060/serio3",

		.callback = lifebook_set_6byte_proto,

	},

	{

		.ident = "Lifebook B142",

drivers/input/mouse/psmouse-base.c

+1 −1
Original line number Diff line number Diff line
@@ -581,7 +581,7 @@ static int cortron_detect(struct psmouse *psmouse, bool set_properties) 
static int psmouse_extensions(struct psmouse *psmouse,

			      unsigned int max_proto, bool set_properties)

{

	bool synaptics_hardware = true;

	bool synaptics_hardware = false;



/*

 * We always check for lifebook because it does not disturb mouse