projects
/
profile
/
common
/
platform
/
kernel
/
linux-artik7.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
221bcb2
9ffecb1
)
Merge tag 'v4.3-rc3' into next
author
Dmitry Torokhov
<dmitry.torokhov@gmail.com>
Tue, 29 Sep 2015 23:28:52 +0000
(16:28 -0700)
committer
Dmitry Torokhov
<dmitry.torokhov@gmail.com>
Tue, 29 Sep 2015 23:28:52 +0000
(16:28 -0700)
Merge with Linux 4.3-rc3 to bring in MFD DA9062 changes to merge DA9062
OnKey driver.
1
2
arch/arm/boot/dts/am437x-sk-evm.dts
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/boot/dts/imx6qdl-tx6.dtsi
patch
|
diff1
|
diff2
|
blob
|
history
drivers/input/joystick/turbografx.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
arch/arm/boot/dts/am437x-sk-evm.dts
Simple merge
diff --cc
arch/arm/boot/dts/imx6qdl-tx6.dtsi
Simple merge
diff --cc
drivers/input/joystick/turbografx.c
index
5f7382a
,
891797a
..
01e8ea9
---
1
/
drivers/input/joystick/turbografx.c
---
2
/
drivers/input/joystick/turbografx.c
+++ b/
drivers/input/joystick/turbografx.c
@@@
-205,8
-196,9
+205,8
@@@
static void tgfx_attach(struct parport
if (n_buttons[i] < 1)
continue;
- if (n_buttons[i] >
6
) {
+ if (n_buttons[i] >
ARRAY_SIZE(tgfx_buttons)
) {
printk(KERN_ERR "turbografx.c: Invalid number of buttons %d\n", n_buttons[i]);
- err = -EINVAL;
goto err_unreg_devs;
}