diff options
| author | Tejun Heo <tj@kernel.org> | 2009-01-31 14:36:00 +0900 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2009-01-31 14:36:00 +0900 |
| commit | da2c0b021cde94866f1e492f940aad29e8f61258 (patch) | |
| tree | 0455f3e221d6128ba1efb68135c3fbe2c2c8b390 /drivers/net/netxen/netxen_nic_init.c | |
| parent | 795f99b61d20c34cb04d17d8906b32f745a635ec (diff) | |
| parent | 33bfad54b58cf05cfe6678c3ec9235d4bc8db4c2 (diff) | |
Merge branch 'master' into tj-percpu
Diffstat (limited to 'drivers/net/netxen/netxen_nic_init.c')
| -rw-r--r-- | drivers/net/netxen/netxen_nic_init.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/netxen/netxen_nic_init.c b/drivers/net/netxen/netxen_nic_init.c index ca7c8d8050c..ffd37bea162 100644 --- a/drivers/net/netxen/netxen_nic_init.c +++ b/drivers/net/netxen/netxen_nic_init.c @@ -947,8 +947,10 @@ int netxen_pinit_from_rom(struct netxen_adapter *adapter, int verbose) } for (i = 0; i < n; i++) { if (netxen_rom_fast_read(adapter, 8*i + 4*offset, &val) != 0 || - netxen_rom_fast_read(adapter, 8*i + 4*offset + 4, &addr) != 0) + netxen_rom_fast_read(adapter, 8*i + 4*offset + 4, &addr) != 0) { + kfree(buf); return -EIO; + } buf[i].addr = addr; buf[i].data = val; |