projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[cascardo/linux.git]
/
drivers
/
net
/
via-velocity.c
diff --git
a/drivers/net/via-velocity.c
b/drivers/net/via-velocity.c
index
3ba3595
..
cee08a1
100644
(file)
--- a/
drivers/net/via-velocity.c
+++ b/
drivers/net/via-velocity.c
@@
-1778,7
+1778,7
@@
static void velocity_error(struct velocity_info *vptr, int status)
* mode
*/
if (vptr->rev_id < REV_ID_VT3216_A0) {
- if (vptr->mii_status
|
VELOCITY_DUPLEX_FULL)
+ if (vptr->mii_status
&
VELOCITY_DUPLEX_FULL)
BYTE_REG_BITS_ON(TCR_TB2BDIS, ®s->TCR);
else
BYTE_REG_BITS_OFF(TCR_TB2BDIS, ®s->TCR);