2 files changed, 5 insertions, 1 deletions

diff --git a/Documentation/parport-lowlevel.txt b/Documentation/parport-lowlevel.txt
index 265fcdcb8e5f..120eb20dbb09 100644
--- a/Documentation/parport-lowlevel.txt
+++ b/Documentation/parport-lowlevel.txt
@@ -339,6 +339,10 @@ Use this function to register your device driver on a parallel port
 ('port').  Once you have done that, you will be able to use
 parport_claim and parport_release in order to use the port.
 
+The ('name') argument is the name of the device that appears in /proc
+filesystem. The string must be valid for the whole lifetime of the
+device (until parport_unregister_device is called).
+
 This function will register three callbacks into your driver:
 'preempt', 'wakeup' and 'irq'.  Each of these may be NULL in order to
 indicate that you do not want a callback.
diff --git a/drivers/net/plip.c b/drivers/net/plip.c
index baf2cbfc8863..57c98669984d 100644
--- a/drivers/net/plip.c
+++ b/drivers/net/plip.c
@@ -1269,7 +1269,7 @@ static void plip_attach (struct parport *port)
 
                 nl = netdev_priv(dev);
                 nl->dev = dev;
-                nl->pardev = parport_register_device(port, name, plip_preempt,
+                nl->pardev = parport_register_device(port, dev->name, plip_preempt,
                                                  plip_wakeup, plip_interrupt,
                                                  0, dev);