diff options
| author | Michael Chan <mchan@broadcom.com> | 2006-12-15 00:56:50 +0100 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2006-12-18 06:59:16 +0100 |
| commit | 6a13add1e1b802a29187a9af98a6ca26539dc33d (patch) | |
| tree | 510c75c132064ec6a976ac0e70a61da02dd328ea /drivers | |
| parent | [BNX2]: Fix panic in bnx2_tx_int(). (diff) | |
| download | linux-6a13add1e1b802a29187a9af98a6ca26539dc33d.tar.xz linux-6a13add1e1b802a29187a9af98a6ca26539dc33d.zip | |
[BNX2]: Fix bug in bnx2_nvram_write().
Length was not calculated correctly if the NVRAM offset is on a non-
aligned offset.
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/bnx2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c index f296c37f29b6..4fa7cefaa296 100644 --- a/drivers/net/bnx2.c +++ b/drivers/net/bnx2.c @@ -3096,7 +3096,7 @@ bnx2_nvram_write(struct bnx2 *bp, u32 offset, u8 *data_buf, if ((align_start = (offset32 & 3))) { offset32 &= ~3; - len32 += align_start; + len32 += (4 - align_start); if ((rc = bnx2_nvram_read(bp, offset32, start, 4))) return rc; } @@ -3114,7 +3114,7 @@ bnx2_nvram_write(struct bnx2 *bp, u32 offset, u8 *data_buf, if (align_start || align_end) { buf = kmalloc(len32, GFP_KERNEL); - if (buf == 0) + if (buf == NULL) return -ENOMEM; if (align_start) { memcpy(buf, start, 4); |