diff options
| author | Alfred M. Szmidt <ams@gnu.org> | 2005-06-02 18:52:39 +0000 |
|---|---|---|
| committer | Thomas Schwinge <tschwinge@gnu.org> | 2009-06-18 00:15:26 +0200 |
| commit | 8a6f23293ca4540950eb523d9ff9727ca92241cd (patch) | |
| tree | b421c6eeeb5710beec5b6568c40d7a036128a535 /linux/src/drivers/net/ne2k-pci.c | |
| parent | e84cb79bec1f5cfa976558bbc9c155b8b82a1b45 (diff) | |
2005-05-28 Alfred M. Szmidt <ams@gnu.org>
* linux/src/drivers/scsi/u14-34f.c (ihdlr): Silence gcc 4.x
errors.
* linux/src/drivers/scsi/qlogicisp.h: Likewise.
* linux/src/drivers/scsi/advansys.c: Likewise.
(advansys_reset, advansys_interrupt, asc_scsi_done_list,
(asc_enqueue, asc_dequeue, asc_dequeue_list, asc_rmqueue,
(asc_isqueued): Likewise.
* linux/src/drivers/scsi/53c78xx.c (NCR53c7xx_queue_command):
Likewise.
* linux/src/drivers/net/ne2k-pci.c (ne_block_input)
(ne_block_output): Likewise.
* linux/src/drivers/net/hp100.c (__initfunc): Likewise.
* linux/src/drivers/net/3c507.c (el16_interrupt): Likewise.
* linux/dev/drivers/scsi/seagate.c (seagate_st0x_queue_command):
Likewise.
Diffstat (limited to 'linux/src/drivers/net/ne2k-pci.c')
| -rw-r--r-- | linux/src/drivers/net/ne2k-pci.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/linux/src/drivers/net/ne2k-pci.c b/linux/src/drivers/net/ne2k-pci.c index 3aa556f..bdc3e74 100644 --- a/linux/src/drivers/net/ne2k-pci.c +++ b/linux/src/drivers/net/ne2k-pci.c @@ -542,7 +542,10 @@ ne_block_input(struct device *dev, int count, struct sk_buff *skb, int ring_offs if (count & 3) { buf += count & ~3; if (count & 2) - *((u16*)buf)++ = inw(NE_BASE + NE_DATAPORT); + { + *buf = *(u16 *) buf + 1; + *buf = inw(NE_BASE + NE_DATAPORT); + } if (count & 1) *buf = inb(NE_BASE + NE_DATAPORT); } @@ -605,7 +608,8 @@ ne_block_output(struct device *dev, int count, if (count & 3) { buf += count & ~3; if (count & 2) - outw(*((u16*)buf)++, NE_BASE + NE_DATAPORT); + outw(*buf++, NE_BASE + NE_DATAPORT); + } #else outsw(NE_BASE + NE_DATAPORT, buf, count>>1); |