diff options
| author | Otavio Salvador <otavio@ossystems.com.br> | 2017-01-23 14:03:26 -0200 |
|---|---|---|
| committer | Otavio Salvador <otavio@ossystems.com.br> | 2017-01-23 14:03:26 -0200 |
| commit | 739f0c753a6df735d66278b4452eb960c0ff6dd1 (patch) | |
| tree | 0fb311aec7d6210c3c3d95743db208d179c87501 /drivers/input | |
| parent | 80e3b3c3c85a3a8b70ef6403bc806901628c7446 (diff) | |
| parent | f40b3cc69de8c97bbcdb74e3cffda06ffcad2cd7 (diff) | |
Merge tag 'v4.1.38' into 4.1-2.0.x-imx
Linux 4.1.38
* tag 'v4.1.38': (109 commits)
Linux 4.1.38
gro: Allow tunnel stacking in the case of FOU/GUE
tunnels: Don't apply GRO to multiple layers of encapsulation.
net: ipv4: Convert IP network timestamps to be y2038 safe
ipip: Properly mark ipip GRO packets as encapsulated.
sg_write()/bsg_write() is not fit to be called under KERNEL_DS
fs: exec: apply CLOEXEC before changing dumpable task flags
IB/cma: Fix a race condition in iboe_addr_get_sgid()
Revert "ALSA: usb-audio: Fix race at stopping the stream"
kvm: nVMX: Allow L1 to intercept software exceptions (#BP and #OF)
drivers/gpu/drm/ast: Fix infinite loop if read fails
target/user: Fix use-after-free of tcmu_cmds if they are expired
kernel/debug/debug_core.c: more properly delay for secondary CPUs
scsi: avoid a permanent stop of the scsi device's request queue
IB/multicast: Check ib_find_pkey() return value
IPoIB: Avoid reading an uninitialized member variable
block_dev: don't test bdev->bd_contains when it is not stable
btrfs: limit async_work allocation and worker func duration
mm/vmscan.c: set correct defer count for shrinker
Input: drv260x - fix input device's parent assignment
...
Diffstat (limited to 'drivers/input')
| -rw-r--r-- | drivers/input/misc/drv260x.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/input/misc/drv260x.c b/drivers/input/misc/drv260x.c index 599578042ea0..009f75d25268 100644 --- a/drivers/input/misc/drv260x.c +++ b/drivers/input/misc/drv260x.c @@ -597,7 +597,6 @@ static int drv260x_probe(struct i2c_client *client, } haptics->input_dev->name = "drv260x:haptics"; - haptics->input_dev->dev.parent = client->dev.parent; haptics->input_dev->close = drv260x_close; input_set_drvdata(haptics->input_dev, haptics); input_set_capability(haptics->input_dev, EV_FF, FF_RUMBLE); |