diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-02-10 12:21:57 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-02-10 12:21:57 -0800 |
| commit | 74c7b2af37ad431c3b69961a5cdbd0a92292c92a (patch) | |
| tree | 10ab40b1b3d8c4343d67422f1d19045e65465113 /drivers/input/serio | |
| parent | 4e54169986d5197cc51ee1069922364c9a92d1be (diff) | |
| parent | ff84dabe3c6ebba517086e1161145d70ff129665 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input updates from Dmitry Torokhov:
"Just small driver fixups"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: colibri-vf50-ts - add missing #include <linux/of.h>
Input: adp5589 - fix row 5 handling for adp5589
Input: edt-ft5x06 - fix setting gain, offset, and threshold via device tree
Input: vmmouse - fix absolute device registration
Input: serio - drop warnings in case of EPROBE_DEFER from serio_find_driver()
Input: cap11xx - add missing of_node_put
Input: sirfsoc-onkey - allow modular build
Input: xpad - remove unused function
Diffstat (limited to 'drivers/input/serio')
| -rw-r--r-- | drivers/input/serio/serio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c index 8f828975ab10..1ca7f551e2da 100644 --- a/drivers/input/serio/serio.c +++ b/drivers/input/serio/serio.c @@ -134,7 +134,7 @@ static void serio_find_driver(struct serio *serio) int error; error = device_attach(&serio->dev); - if (error < 0) + if (error < 0 && error != -EPROBE_DEFER) dev_warn(&serio->dev, "device_attach() failed for %s (%s), error: %d\n", serio->phys, serio->name, error); |