diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-08 00:53:00 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-08 00:53:00 +0000 |
commit | b8553086288629b4efb77e97f5582e08bc50ad65 (patch) | |
tree | 0a19bd1c21e148f35c7a0f76baa4f7a056b966b0 /drivers/char/ppdev.c | |
parent | 75b6d92f2dd5112b02f4e78cf9f35f9825946ef0 (diff) |
Merge with 2.4.0-test3-pre4.
Diffstat (limited to 'drivers/char/ppdev.c')
-rw-r--r-- | drivers/char/ppdev.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/ppdev.c b/drivers/char/ppdev.c index ae4b9e112..4e2be3c8b 100644 --- a/drivers/char/ppdev.c +++ b/drivers/char/ppdev.c @@ -105,9 +105,9 @@ static void pp_attach (struct parport *port) return; } - add->next = pp_port_list; add->port = port; down (&pp_port_list_lock); + add->next = pp_port_list; pp_port_list = add; up (&pp_port_list_lock); } @@ -663,7 +663,7 @@ static int __init ppdev_init (void) PP_MAJOR); return -EIO; } - devfs_handle = devfs_mk_dir (NULL, "parports", 0, NULL); + devfs_handle = devfs_mk_dir (NULL, "parports", NULL); devfs_register_series (devfs_handle, "%u", PARPORT_MAX, DEVFS_FL_DEFAULT, PP_MAJOR, 0, S_IFCHR | S_IRUGO | S_IWUGO, |