kernel/drivers/input/misc, branch linux-4.1.y

Input: drv260x - fix initializing overdrive voltage

2018-05-23T01:36:36Z

[ Upstream commit 74c82dae6c474933f2be401976e1530b5f623221 ] We were accidentally initializing haptics->rated_voltage twice, and did not initialize overdrive voltage. Acked-by: Dan Murphy Signed-off-by: Dmitry Torokhov Signed-off-by: Sasha Levin

Input: twl6040-vibra - fix child-node lookup

2018-03-01T03:09:38Z

[ Upstream commit dcaf12a8b0bbdbfcfa2be8dff2c4948d9844b4ad ] Fix child-node lookup during probe, which ended up searching the whole device tree depth-first starting at parent rather than just matching on its children. Later sanity checks on node properties (which would likely be missing) should prevent this from causing much trouble however, especially as the original premature free of the parent node has already been fixed separately (but that "fix" was apparently never backported to stable). Fixes: e7ec014a47e4 ("Input: twl6040-vibra - update for device tree support") Fixes: c52c545ead97 ("Input: twl6040-vibra - fix DT node memory management") Cc: stable # 3.6 Signed-off-by: Johan Hovold Acked-by: Peter Ujfalusi Tested-by: H. Nikolaus Schaller (on Pyra OMAP5 hardware) Signed-off-by: Dmitry Torokhov Signed-off-by: Sasha Levin

Input: twl6040-vibra - fix DT node memory management

2018-03-01T03:09:38Z

[ Upstream commit c52c545ead97fcc2f4f8ea38f1ae3c23211e09a8 ] commit e7ec014a47e4 ("Input: twl6040-vibra - update for device tree support") made the separate vibra DT node to a subnode of the twl6040. It now calls of_find_node_by_name() to locate the "vibra" subnode. This function has a side effect to call of_node_put on() for the twl6040 parent node passed in as a parameter. This causes trouble later on. Solution: we must call of_node_get() before of_find_node_by_name() Signed-off-by: H. Nikolaus Schaller Signed-off-by: Dmitry Torokhov Signed-off-by: Sasha Levin

Input: ims-psu - check if CDC union descriptor is sane

2017-12-07T02:20:06Z

[ Upstream commit ea04efee7635c9120d015dcdeeeb6988130cb67a ] Before trying to use CDC union descriptor, try to validate whether that it is sane by checking that intf->altsetting->extra is big enough and that descriptor bLength is not too big and not too small. Reported-by: Andrey Konovalov Signed-off-by: Dmitry Torokhov Signed-off-by: Sasha Levin

Input: yealink - validate number of endpoints before using them

2017-05-17T19:07:02Z

[ Upstream commit 5cc4a1a9f5c179795c8a1f2b0f4361829d6a070e ] Make sure to check the number of endpoints to avoid dereferencing a NULL-pointer should a malicious device lack endpoints. Fixes: aca951a22a1d ("[PATCH] input-driver-yealink-P1K-usb-phone") Signed-off-by: Johan Hovold Cc: stable@vger.kernel.org # 2.6.14 Signed-off-by: Dmitry Torokhov Signed-off-by: Sasha Levin

Input: ims-pcu - validate number of endpoints before using them

2017-05-17T19:07:02Z

[ Upstream commit 1916d319271664241b7aa0cd2b05e32bdb310ce9 ] Make sure to check the number of endpoints to avoid dereferencing a NULL-pointer should a malicious device lack control-interface endpoints. Fixes: 628329d52474 ("Input: add IMS Passenger Control Unit driver") Signed-off-by: Johan Hovold Cc: stable@vger.kernel.org # 3.10 Signed-off-by: Dmitry Torokhov Signed-off-by: Sasha Levin

Input: cm109 - validate number of endpoints before using them

2017-05-17T19:07:02Z

[ Upstream commit ac2ee9ba953afe88f7a673e1c0c839227b1d7891 ] Make sure to check the number of endpoints to avoid dereferencing a NULL-pointer should a malicious device lack endpoints. Fixes: c04148f915e5 ("Input: add driver for USB VoIP phones with CM109...") Signed-off-by: Johan Hovold Cc: stable@vger.kernel.org # 2.6.28 Signed-off-by: Dmitry Torokhov Signed-off-by: Sasha Levin

Input: drv260x - fix input device's parent assignment

2017-01-13T01:56:57Z

[ Upstream commit 5a8a6b89c15766446d845671d574a9243b6d8786 ] We were assigning I2C bus controller instead of client as parent device. Besides being logically wrong, it messed up with devm handling of input device. As a result we were leaving input device and event node behind after rmmod-ing the driver, which lead to a kernel oops if one were to access the event node later. Let's remove the assignment and rely on devm_input_allocate_device() to set it up properly for us. Signed-off-by: Jingkui Wang Fixes: 7132fe4f5687 ("Input: drv260x - add TI drv260x haptics driver") Cc: stable@vger.kernel.org Signed-off-by: Dmitry Torokhov Signed-off-by: Sasha Levin

Input: pmic8xxx-pwrkey - fix algorithm for converting trigger delay

2016-07-11T03:07:09Z

[ Upstream commit eda5ecc0a6b865561997e177c393f0b0136fe3b7 ] The trigger delay algorithm that converts from microseconds to the register value looks incorrect. According to most of the PMIC documentation, the equation is delay (Seconds) = (1 / 1024) * 2 ^ (x + 4) except for one case where the documentation looks to have a formatting issue and the equation looks like delay (Seconds) = (1 / 1024) * 2 x + 4 Most likely this driver was written with the improper documentation to begin with. According to the downstream sources the valid delays are from 2 seconds to 1/64 second, and the latter equation just doesn't make sense for that. Let's fix the algorithm and the range check to match the documentation and the downstream sources. Reported-by: Bjorn Andersson Fixes: 92d57a73e410 ("input: Add support for Qualcomm PMIC8XXX power key") Signed-off-by: Stephen Boyd Tested-by: John Stultz Acked-by: Bjorn Andersson Signed-off-by: Dmitry Torokhov Signed-off-by: Sasha Levin

Input: pwm-beeper - fix - scheduling while atomic

2016-06-06T23:12:35Z

[ Upstream commit f49cf3b8b4c841457244c461c66186a719e13bcc ] Pwm config may sleep so defer it using a worker. On a Freescale i.MX53 based board we ran into "BUG: scheduling while atomic" because input_inject_event locks interrupts, but imx_pwm_config_v2 sleeps. Tested on Freescale i.MX53 SoC with 4.6.0. Signed-off-by: Manfred Schlaegl Cc: stable@vger.kernel.org Signed-off-by: Dmitry Torokhov Signed-off-by: Sasha Levin