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

Commit 851710a8 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 

Pull input fixes from Dmitry Torokhov:

 - we are reverting patch that was switched touchpad on Lenovo T460P
   over to native RMI because on these boxes BIOS messes up with SMBus
   controller state. We might re-enable it later once SMBus issue is
   resolved

 - disabling interrupts in matrix_keypad driver was racy

 - mms114 now has SPDX header and matching MODULE_LICENSE

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Revert "Input: synaptics - Lenovo Thinkpad T460p devices should use RMI"
  Input: matrix_keypad - fix race when disabling interrupts
  Input: mms114 - add SPDX identifier
  Input: mms114 - fix license module information
parents ea9b5ee3 5444a992

drivers/input/keyboard/matrix_keypad.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -218,8 +218,10 @@ static void matrix_keypad_stop(struct input_dev *dev) 
{

{

	struct matrix_keypad *keypad = input_get_drvdata(dev);

	struct matrix_keypad *keypad = input_get_drvdata(dev);





	spin_lock_irq(&keypad->lock);

	keypad->stopped = true;

	keypad->stopped = true;

	mb();

	spin_unlock_irq(&keypad->lock);



	flush_work(&keypad->work.work);

	flush_work(&keypad->work.work);

	/*

	/*

	 * matrix_keypad_scan() will leave IRQs enabled;

	 * matrix_keypad_scan() will leave IRQs enabled;

drivers/input/mouse/synaptics.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -173,7 +173,6 @@ static const char * const smbus_pnp_ids[] = { 
	"LEN0046", /* X250 */

	"LEN0046", /* X250 */

	"LEN004a", /* W541 */

	"LEN004a", /* W541 */

	"LEN200f", /* T450s */

	"LEN200f", /* T450s */

	"LEN2018", /* T460p */

	NULL

	NULL

};

};

drivers/input/touchscreen/mms114.c

+6 −9
Original line number Original line Diff line number Diff line 
/*

// SPDX-License-Identifier: GPL-2.0

 * Copyright (C) 2012 Samsung Electronics Co.Ltd

// Melfas MMS114/MMS152 touchscreen device driver

 * Author: Joonyoung Shim <jy0922.shim@samsung.com>

//

 *

// Copyright (c) 2012 Samsung Electronics Co., Ltd.

 * This program is free software; you can redistribute it and/or modify

// Author: Joonyoung Shim <jy0922.shim@samsung.com>

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */





#include <linux/module.h>

#include <linux/module.h>

#include <linux/delay.h>

#include <linux/delay.h>
@@ -624,4 +621,4 @@ module_i2c_driver(mms114_driver); 
/* Module information */

/* Module information */

MODULE_AUTHOR("Joonyoung Shim <jy0922.shim@samsung.com>");

MODULE_AUTHOR("Joonyoung Shim <jy0922.shim@samsung.com>");

MODULE_DESCRIPTION("MELFAS mms114 Touchscreen driver");

MODULE_DESCRIPTION("MELFAS mms114 Touchscreen driver");

MODULE_LICENSE("GPL");
 
MODULE_LICENSE("GPL v2");