From 9cdb328185449b62a0fdc81f7d7c34523777149f Mon Sep 17 00:00:00 2001 From: Eilon Greenstein Date: Mon, 2 Mar 2009 08:01:05 +0000 Subject: [PATCH] --- yaml --- r: 135025 b: refs/heads/master c: c016201c5c6520abfcbd0c539fbf2524dd431ce6 h: refs/heads/master i: 135023: ac702c28026bdaafd6b6d0ed231e30f4cad77fe2 v: v3 --- [refs] | 2 +- trunk/drivers/net/bnx2x_init.h | 4 ++-- trunk/drivers/net/bnx2x_main.c | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index bb2323a1df1d..27cfbe18947b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8660d8c3abd988d1601b78046733450cc3554a35 +refs/heads/master: c016201c5c6520abfcbd0c539fbf2524dd431ce6 diff --git a/trunk/drivers/net/bnx2x_init.h b/trunk/drivers/net/bnx2x_init.h index 5362d5a42acb..39ba2936c0c2 100644 --- a/trunk/drivers/net/bnx2x_init.h +++ b/trunk/drivers/net/bnx2x_init.h @@ -186,8 +186,8 @@ static void bnx2x_init_fill(struct bnx2x *bp, u32 addr, int fill, u32 len) static void bnx2x_init_wr_64(struct bnx2x *bp, u32 addr, const u32 *data, u32 len64) { - u32 buf_len32 = FW_BUF_SIZE/4; - u32 len = len64*2; + u32 buf_len32 = FW_BUF_SIZE / 4; + u32 len = len64 * 2; u64 data64 = 0; int i; diff --git a/trunk/drivers/net/bnx2x_main.c b/trunk/drivers/net/bnx2x_main.c index 5397de1fc8d2..bb9d53966fc1 100644 --- a/trunk/drivers/net/bnx2x_main.c +++ b/trunk/drivers/net/bnx2x_main.c @@ -11048,6 +11048,7 @@ static int __devinit bnx2x_init_one(struct pci_dev *pdev, (bnx2x_get_pcie_speed(bp) == 2) ? "5GHz (Gen2)" : "2.5GHz", dev->base_addr, bp->pdev->irq); printk(KERN_CONT "node addr %pM\n", dev->dev_addr); + return 0; init_one_exit: