aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/netxen/netxen_nic_init.c
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2007-12-22 14:44:00 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-28 18:10:31 -0500
commitf305f789bb96ee6e35e71f58324b72abb7bd0b13 (patch)
tree980647f9eff15b56ef120904d62c1cff1644eb40 /drivers/net/netxen/netxen_nic_init.c
parent66341fffd4e5e546906ebcfeb6f5cce8df802c17 (diff)
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,
438 int ret = 0; 438 int ret = 0;
439 439
440 for (addridx = addr; addridx < (addr + size); addridx += 4) { 440 for (addridx = addr; addridx < (addr + size); addridx += 4) {
441 ret = do_rom_fast_read(adapter, addridx, (int *)bytes); 441 int v;
442 ret = do_rom_fast_read(adapter, addridx, &v);
442 if (ret != 0) 443 if (ret != 0)
443 break; 444 break;
444 *(int *)bytes = cpu_to_le32(*(int *)bytes); 445 *(__le32 *)bytes = cpu_to_le32(v);
445 bytes += 4; 446 bytes += 4;
446 } 447 }
447 448
@@ -501,7 +502,7 @@ static int do_rom_fast_write_words(struct netxen_adapter *adapter,
501 int timeout = 0; 502 int timeout = 0;
502 int data; 503 int data;
503 504
504 data = le32_to_cpu((*(u32*)bytes)); 505 data = le32_to_cpu((*(__le32*)bytes));
505 ret = do_rom_fast_write(adapter, addridx, data); 506 ret = do_rom_fast_write(adapter, addridx, data);
506 if (ret < 0) 507 if (ret < 0)
507 return ret; 508 return ret;