summaryrefslogtreecommitdiffstats
path: root/drivers/input/serio
diff options
context:
space:
mode:
authorDmitry Eremin-Solenikov <dbaryshkov@gmail.com>2010-08-09 18:22:50 +0400
committerGreg Kroah-Hartman <gregkh@suse.de>2010-10-22 10:19:58 -0700
commitde838a93cbf35671f890360b886a5c2a8a5d1aa4 (patch)
treebc4507f747962f3ab424df45efcdf01a0b188280 /drivers/input/serio
parent30004ac9c090dcdcca99556b4587b3bad828731a (diff)
downloadlinux-stable-de838a93cbf35671f890360b886a5c2a8a5d1aa4.tar.gz
linux-stable-de838a93cbf35671f890360b886a5c2a8a5d1aa4.tar.bz2
linux-stable-de838a93cbf35671f890360b886a5c2a8a5d1aa4.zip
serport: place serport serio device correctly in the device tree
Make serport serio device to be a child of corresponding tty device instead of just hanging at /sys/devices/serioX. Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> Acked-by: Dmitry Torokhov <dtor@mail.ru> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/input/serio')
-rw-r--r--drivers/input/serio/serport.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/input/serio/serport.c b/drivers/input/serio/serport.c
index 6d345112bcb7..6e362de3f412 100644
--- a/drivers/input/serio/serport.c
+++ b/drivers/input/serio/serport.c
@@ -165,6 +165,7 @@ static ssize_t serport_ldisc_read(struct tty_struct * tty, struct file * file, u
serio->open = serport_serio_open;
serio->close = serport_serio_close;
serio->port_data = serport;
+ serio->dev.parent = tty->dev;
serio_register_port(serport->serio);
printk(KERN_INFO "serio: Serial port %s\n", tty_name(tty, name));