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

Commit ed1e33dd 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 subsystem fixes from Dmitry Torokhov.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: twl6040-vibra - fix DT node memory management
  Input: max8997-haptic - fix NULL pointer dereference
  Input: byd - update copyright header
parents 422ce5a9 c52c545e

drivers/input/misc/max8997_haptic.c

+4 −2
Original line number Diff line number Diff line
@@ -255,12 +255,14 @@ static int max8997_haptic_probe(struct platform_device *pdev) 
	struct max8997_dev *iodev = dev_get_drvdata(pdev->dev.parent);

	const struct max8997_platform_data *pdata =

					dev_get_platdata(iodev->dev);

	const struct max8997_haptic_platform_data *haptic_pdata =

					pdata->haptic_pdata;

	const struct max8997_haptic_platform_data *haptic_pdata = NULL;

	struct max8997_haptic *chip;

	struct input_dev *input_dev;

	int error;



	if (pdata)

		haptic_pdata = pdata->haptic_pdata;



	if (!haptic_pdata) {

		dev_err(&pdev->dev, "no haptic platform data\n");

		return -EINVAL;

drivers/input/misc/twl6040-vibra.c

+1 −0
Original line number Diff line number Diff line
@@ -257,6 +257,7 @@ static int twl6040_vibra_probe(struct platform_device *pdev) 
	int vddvibr_uV = 0;

	int error;



	of_node_get(twl6040_core_dev->of_node);

	twl6040_core_node = of_find_node_by_name(twl6040_core_dev->of_node,

						 "vibra");

	if (!twl6040_core_node) {

drivers/input/mouse/byd.c

+4 −0
Original line number Diff line number Diff line
@@ -2,6 +2,10 @@ 
 * BYD TouchPad PS/2 mouse driver

 *

 * Copyright (C) 2015 Chris Diamand <chris@diamand.org>

 * Copyright (C) 2015 Richard Pospesel

 * Copyright (C) 2015 Tai Chi Minh Ralph Eastwood

 * Copyright (C) 2015 Martin Wimpress

 * Copyright (C) 2015 Jay Kuri

 *

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

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