From 0c9d6889e3d1327d2e3a30bbf71021311abb7281 Mon Sep 17 00:00:00 2001
From: Julia Lawall <julia@diku.dk>
Date: Thu, 13 May 2010 22:02:56 +0200
Subject: [PATCH] --- yaml --- r: 202731 b: refs/heads/master c:
 6ac478cf05662911242957e8f765c623be23cf2a h: refs/heads/master i:   202729:
 e682cee51a95279d931824fd7fa69964e7f66f01   202727:
 e717d3b527631c012571f419c4d636c0c2a6cb17 v: v3

---
 [refs]                                           | 2 +-
 trunk/drivers/net/wireless/orinoco/orinoco_usb.c | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index c031244ca3a5..2a17029149ec 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 08578b8f16ca551499c54f2cd229df3e58c8f381
+refs/heads/master: 6ac478cf05662911242957e8f765c623be23cf2a
diff --git a/trunk/drivers/net/wireless/orinoco/orinoco_usb.c b/trunk/drivers/net/wireless/orinoco/orinoco_usb.c
index 78f089baa8c9..020da76c9558 100644
--- a/trunk/drivers/net/wireless/orinoco/orinoco_usb.c
+++ b/trunk/drivers/net/wireless/orinoco/orinoco_usb.c
@@ -356,12 +356,10 @@ static struct request_context *ezusb_alloc_ctx(struct ezusb_priv *upriv,
 {
 	struct request_context *ctx;
 
-	ctx = kmalloc(sizeof(*ctx), GFP_ATOMIC);
+	ctx = kzalloc(sizeof(*ctx), GFP_ATOMIC);
 	if (!ctx)
 		return NULL;
 
-	memset(ctx, 0, sizeof(*ctx));
-
 	ctx->buf = kmalloc(BULK_BUF_SIZE, GFP_ATOMIC);
 	if (!ctx->buf) {
 		kfree(ctx);