diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-03-08 12:26:07 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-03-08 12:26:07 +0100 |
| commit | fe36d8912c8e402c62ce5a8712b6a47baae1ceaa (patch) | |
| tree | f8394fd1dbb10b2d075e74d0f6b09ec29c795fe6 /drivers/input/serio/serio.c | |
| parent | irqchip/mips-gic: Add new DT property to reserve IPIs (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | linux-fe36d8912c8e402c62ce5a8712b6a47baae1ceaa.tar.xz linux-fe36d8912c8e402c62ce5a8712b6a47baae1ceaa.zip | |
Merge branch 'linus' into irq/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/input/serio/serio.c')
| -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); |