Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+9
-2
+4
-2
drivers/input/misc/max8997_haptic.c
+4
-2
drivers/input/misc/max8997_haptic.c
···
255
255
struct max8997_dev *iodev = dev_get_drvdata(pdev->dev.parent);
256
256
const struct max8997_platform_data *pdata =
257
257
dev_get_platdata(iodev->dev);
258
-
const struct max8997_haptic_platform_data *haptic_pdata =
259
-
pdata->haptic_pdata;
258
+
const struct max8997_haptic_platform_data *haptic_pdata = NULL;
260
259
struct max8997_haptic *chip;
261
260
struct input_dev *input_dev;
262
261
int error;
262
+
263
+
if (pdata)
264
+
haptic_pdata = pdata->haptic_pdata;
263
265
264
266
if (!haptic_pdata) {
265
267
dev_err(&pdev->dev, "no haptic platform data\n");
+1
drivers/input/misc/twl6040-vibra.c
+1
drivers/input/misc/twl6040-vibra.c
+4
drivers/input/mouse/byd.c
+4
drivers/input/mouse/byd.c
···
2
2
* BYD TouchPad PS/2 mouse driver
3
3
*
4
4
* Copyright (C) 2015 Chris Diamand <chris@diamand.org>
5
+
* Copyright (C) 2015 Richard Pospesel
6
+
* Copyright (C) 2015 Tai Chi Minh Ralph Eastwood
7
+
* Copyright (C) 2015 Martin Wimpress
8
+
* Copyright (C) 2015 Jay Kuri
5
9
*
6
10
* This program is free software; you can redistribute it and/or modify it
7
11
* under the terms of the GNU General Public License version 2 as published by