projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
cefb26d
7a308bb
)
Merge tag 'v4.10-rc5' into next
author
Dmitry Torokhov
<dmitry.torokhov@gmail.com>
Tue, 24 Jan 2017 20:37:43 +0000
(12:37 -0800)
committer
Dmitry Torokhov
<dmitry.torokhov@gmail.com>
Tue, 24 Jan 2017 20:37:43 +0000
(12:37 -0800)
Sync up with mainline to bring up improvements in various subsystems.
1
2
drivers/input/joystick/xpad.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/input/keyboard/cros_ec_keyb.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/input/misc/arizona-haptics.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/input/misc/tps65218-pwrbutton.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/input/mouse/trackpoint.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/input/serio/i8042-x86ia64io.h
patch
|
diff1
|
diff2
|
blob
|
history
drivers/input/touchscreen/elants_i2c.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
drivers/input/joystick/xpad.c
Simple merge
diff --cc
drivers/input/keyboard/cros_ec_keyb.c
index
165c722
,
25943e9
..
87d071a
---
1
/
drivers/input/keyboard/cros_ec_keyb.c
---
2
/
drivers/input/keyboard/cros_ec_keyb.c
+++ b/
drivers/input/keyboard/cros_ec_keyb.c
@@@
-265,13
-245,10
+245,9
@@@
static int cros_ec_keyb_probe(struct pl
if (!idev)
return -ENOMEM;
- if (!ec->irq) {
- dev_err(dev, "no EC IRQ specified\n");
- return -EINVAL;
- }
-
ckdev->ec = ec;
+ ckdev->notifier.notifier_call = cros_ec_keyb_work;
ckdev->dev = dev;
- dev_set_drvdata(dev, ckdev);
idev->name = CROS_EC_DEV_NAME;
idev->phys = ec->phys_name;
diff --cc
drivers/input/misc/arizona-haptics.c
Simple merge
diff --cc
drivers/input/misc/tps65218-pwrbutton.c
Simple merge
diff --cc
drivers/input/mouse/trackpoint.c
Simple merge
diff --cc
drivers/input/serio/i8042-x86ia64io.h
Simple merge
diff --cc
drivers/input/touchscreen/elants_i2c.c
Simple merge