summaryrefslogtreecommitdiffstats
path: root/drivers/net/netxen/netxen_nic_init.c
diff options
context:
space:
mode:
authorAl Viro2007-12-22 20:44:00 +0100
committerDavid S. Miller2008-01-29 00:10:31 +0100
commitf305f789bb96ee6e35e71f58324b72abb7bd0b13 (patch)
tree980647f9eff15b56ef120904d62c1cff1644eb40 /drivers/net/netxen/netxen_nic_init.c
parentannotate myri10ge (diff)
downloadkernel-qcow2-linux-f305f789bb96ee6e35e71f58324b72abb7bd0b13.tar.gz
kernel-qcow2-linux-f305f789bb96ee6e35e71f58324b72abb7bd0b13.tar.xz
kernel-qcow2-linux-f305f789bb96ee6e35e71f58324b72abb7bd0b13.zip
annotate netxen
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/netxen/netxen_nic_init.c')
-rw-r--r--drivers/net/netxen/netxen_nic_init.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/netxen/netxen_nic_init.c b/drivers/net/netxen/netxen_nic_init.c
index 74685a1a0b71..9e38bcb3fba9 100644
--- a/drivers/net/netxen/netxen_nic_init.c
+++ b/drivers/net/netxen/netxen_nic_init.c
@@ -438,10 +438,11 @@ static int do_rom_fast_read_words(struct netxen_adapter *adapter, int addr,
int ret = 0;
for (addridx = addr; addridx < (addr + size); addridx += 4) {
- ret = do_rom_fast_read(adapter, addridx, (int *)bytes);
+ int v;
+ ret = do_rom_fast_read(adapter, addridx, &v);
if (ret != 0)
break;
- *(int *)bytes = cpu_to_le32(*(int *)bytes);
+ *(__le32 *)bytes = cpu_to_le32(v);
bytes += 4;
}
@@ -501,7 +502,7 @@ static int do_rom_fast_write_words(struct netxen_adapter *adapter,
int timeout = 0;
int data;
- data = le32_to_cpu((*(u32*)bytes));
+ data = le32_to_cpu((*(__le32*)bytes));
ret = do_rom_fast_write(adapter, addridx, data);
if (ret < 0)
return ret;