diff options
| author | Cesar Eduardo Barros <cesarb@cesarb.net> | 2012-01-07 05:13:17 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-01-07 12:09:36 -0800 |
| commit | 77e1e438cbb1b8f9b7a3bb2d4f0264d1dd952d75 (patch) | |
| tree | 055f27071fd8cb39f3086a655c109f311f16069e /drivers/net/ethernet/rdc | |
| parent | f3f511e1ce6f1a6f0a5bb8320e9f802e76f6b999 (diff) | |
| download | linux-77e1e438cbb1b8f9b7a3bb2d4f0264d1dd952d75.tar.gz linux-77e1e438cbb1b8f9b7a3bb2d4f0264d1dd952d75.tar.xz | |
r6040: fix typo in use of MCR0 register bits
Commit 4e16d6ebd65b4f2c4e3f780b4c5704beef64019c (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: Cesar Eduardo Barros <cesarb@cesarb.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/rdc')
| -rw-r--r-- | drivers/net/ethernet/rdc/r6040.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/rdc/r6040.c b/drivers/net/ethernet/rdc/r6040.c index 87aa43935070..cb0eca807852 100644 --- a/drivers/net/ethernet/rdc/r6040.c +++ b/drivers/net/ethernet/rdc/r6040.c @@ -1160,7 +1160,7 @@ static int __devinit r6040_init_one(struct pci_dev *pdev, lp->dev = dev; /* Init RDC private data */ - lp->mcr0 = MCR0_XMTEN | MCR0; + lp->mcr0 = MCR0_XMTEN | MCR0_RCVEN; /* The RDC-specific entries in the device structure. */ dev->netdev_ops = &r6040_netdev_ops; |