---

yaml --- r: 74081 b: refs/heads/master c: cdb3270 h: refs/heads/master i: 74079: 8585143 v: v3
git-mirror · Nov 27, 2007 · 52d757e · 52d757e
1 parent 1b4318e
commit 52d757e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f6ce5cca74b8681fdf1d7307edc66a7213b43f6f
+refs/heads/master: cdb32706f6948238ed6d1d85473c64c27366e9e9
diff --git a/trunk/Documentation/parport-lowlevel.txt b/trunk/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/trunk/drivers/net/plip.c b/trunk/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);