diff options
| author | Warner Losh <imp@FreeBSD.org> | 2003-10-23 05:33:53 +0000 |
|---|---|---|
| committer | Warner Losh <imp@FreeBSD.org> | 2003-10-23 05:33:53 +0000 |
| commit | 71d72f88920630434af751eb1911ddbb3a95a3f9 (patch) | |
| tree | a8cc92b1f3a995378f80024278f4b3e4f61d85ec | |
| parent | c0432d033e292851f0925e9fbd81cc36b9248688 (diff) | |
| download | src-71d72f88920630434af751eb1911ddbb3a95a3f9.tar.gz src-71d72f88920630434af751eb1911ddbb3a95a3f9.zip | |
Fix mismerge from one tree to another: add (
Notes
Notes:
svn path=/head/; revision=121399
| -rw-r--r-- | sys/dev/ep/if_ep.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/dev/ep/if_ep.c b/sys/dev/ep/if_ep.c index db51b0003ef2..3b591d3f5ee1 100644 --- a/sys/dev/ep/if_ep.c +++ b/sys/dev/ep/if_ep.c @@ -767,7 +767,7 @@ read_again: m->m_len += (lenthisone & 3); } else { EP_READ_MULTI_2(sc, EP_W1_RX_PIO_RD_1, - (uint16_t *)mtod(m, caddr_t)+m->m_len), + (uint16_t *)(mtod(m, caddr_t)+m->m_len), lenthisone / 2); m->m_len += lenthisone; if (lenthisone & 1) |