Message ID | 20090814035733.GA29707@fencepost.gnu.org |
---|---|
State | Changes Requested, archived |
Delegated to: | David Miller |
Headers | show |
From: Davidlohr Bueso <dave@gnu.org> Date: Thu, 13 Aug 2009 23:57:33 -0400 > Ok, resubmitting and verified by checkpatch.pl > > Thanks. > > Signed-off-by: Davidlohr Bueso <dave@gnu.org> Your email client has corrupted the patch, turning tab characters into spaces and whatnot. Please correct this and make a fresh, formal, resubmission (fresh subject, commit message, and all). Thank you. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c index 458daa0..2bc62d3 100644 --- a/drivers/net/s2io.c +++ b/drivers/net/s2io.c @@ -870,8 +870,10 @@ static int init_shared_mem(struct s2io_nic *nic) while (k != rxd_count[nic->rxd_mode]) { ba = &mac_control->rings[i].ba[j][k]; - ba->ba_0_org = (void *) kmalloc - (BUF0_LEN + ALIGN_SIZE, GFP_KERNEL); + ba->ba_0_org = kmalloc + (BUF0_LEN + ALIGN_SIZE, + GFP_KERNEL); + if (!ba->ba_0_org) return -ENOMEM; mem_allocated += @@ -881,8 +883,10 @@ static int init_shared_mem(struct s2io_nic *nic) tmp &= ~((unsigned long) ALIGN_SIZE); ba->ba_0 = (void *) tmp; - ba->ba_1_org = (void *) kmalloc - (BUF1_LEN + ALIGN_SIZE, GFP_KERNEL); + ba->ba_1_org = kmalloc + (BUF1_LEN + ALIGN_SIZE, + GFP_KERNEL); + if (!ba->ba_1_org) return -ENOMEM; mem_allocated