diff options
| author | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2010-10-04 21:46:10 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-10-13 07:49:28 -0700 |
| commit | 0982258264d2f615612ab957634efdeb874f47c8 (patch) | |
| tree | 4667defc535f028e3ee4a11ded29b050cf5926e7 /drivers/input/mouse/psmouse-base.c | |
| parent | a8b3c0f57beaba9035e5339175628b63e551b243 (diff) | |
| download | blackbird-op-linux-0982258264d2f615612ab957634efdeb874f47c8.tar.gz blackbird-op-linux-0982258264d2f615612ab957634efdeb874f47c8.zip | |
Input: serio - support multiple child devices per single parent
Some (rare) serio devices need to have multiple serio children. One of
the examples is PS/2 multiplexer present on several TQC STKxxx boards,
which connect PS/2 keyboard and mouse to single tty port.
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input/mouse/psmouse-base.c')
| -rw-r--r-- | drivers/input/mouse/psmouse-base.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c index 73a7af2542a8..cd9d0c97e429 100644 --- a/drivers/input/mouse/psmouse-base.c +++ b/drivers/input/mouse/psmouse-base.c @@ -1584,10 +1584,10 @@ static ssize_t psmouse_attr_set_protocol(struct psmouse *psmouse, void *data, co if (!new_dev) return -ENOMEM; - while (serio->child) { + while (!list_empty(&serio->children)) { if (++retry > 3) { printk(KERN_WARNING - "psmouse: failed to destroy child port, " + "psmouse: failed to destroy children ports, " "protocol change aborted.\n"); input_free_device(new_dev); return -EIO; |
