Commit 77e1e438 authored by Cesar Eduardo Barros's avatar Cesar Eduardo Barros Committed by David S. Miller

r6040: fix typo in use of MCR0 register bits

Commit 4e16d6eb (r6040: define more MCR0
register bits) added #define values for MCR0 register bits and converted
uses of hardcoded magic values to uses of these defines.

However, one of the conversions looks suspicious:

 #define MCR0		0x00	/* Control register 0 */
+#define  MCR0_RCVEN	0x0002	/* Receive enable */
+#define  MCR0_XMTEN	0x1000	/* Transmission enable */

 	/* Init RDC private data */
-	lp->mcr0 = 0x1002;
+	lp->mcr0 = MCR0_XMTEN | MCR0;

I believe what was meant here was MCR0_XMTEN | MCR0_RCVEN, which makes
sense and matches the original values.
Signed-off-by: default avatarCesar Eduardo Barros <cesarb@cesarb.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f3f511e1
...@@ -1160,7 +1160,7 @@ static int __devinit r6040_init_one(struct pci_dev *pdev, ...@@ -1160,7 +1160,7 @@ static int __devinit r6040_init_one(struct pci_dev *pdev,
lp->dev = dev; lp->dev = dev;
/* Init RDC private data */ /* Init RDC private data */
lp->mcr0 = MCR0_XMTEN | MCR0; lp->mcr0 = MCR0_XMTEN | MCR0_RCVEN;
/* The RDC-specific entries in the device structure. */ /* The RDC-specific entries in the device structure. */
dev->netdev_ops = &r6040_netdev_ops; dev->netdev_ops = &r6040_netdev_ops;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment