diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-06-09 11:07:15 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-06-09 11:07:15 +1000 |
| commit | 88fe68d902f1ceef6f28a7191cc5e786fd4f8f78 (patch) | |
| tree | 85a6bf528fddf13dfa2e8b6d1d16cfa9a3301e89 /drivers/net/wireless/orinoco/orinoco_usb.c | |
| parent | d1a78417d701a2eab47f03be271f174ad0ec2b13 (diff) | |
| parent | 832c10fd733893f86c63bde1c65b005d5a2fe346 (diff) | |
Merge remote branch 'wireless/master'
Conflicts:
drivers/net/wireless/wl12xx/wl1271.h
drivers/net/wireless/wl12xx/wl1271_cmd.h
Diffstat (limited to 'drivers/net/wireless/orinoco/orinoco_usb.c')
| -rw-r--r-- | drivers/net/wireless/orinoco/orinoco_usb.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/wireless/orinoco/orinoco_usb.c b/drivers/net/wireless/orinoco/orinoco_usb.c index 11536ef17ba3..1558381998ee 100644 --- a/drivers/net/wireless/orinoco/orinoco_usb.c +++ b/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); |