From 920abb63a30296418bcca3a5211df83e5798ef7e Mon Sep 17 00:00:00 2001 From: Devendra Naga Date: Sun, 26 Aug 2012 02:52:35 +0530 Subject: [PATCH] --- yaml --- r: 324612 b: refs/heads/master c: 07ad99c9e32173852997523eb920950902563941 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/gdm72xx/gdm_sdio.c | 4 +--- trunk/drivers/staging/gdm72xx/gdm_usb.c | 4 +--- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 8b14d694eb39..a2e5aed1e809 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8f8b77bfdce811acbcf2248219a7aab5f92de938 +refs/heads/master: 07ad99c9e32173852997523eb920950902563941 diff --git a/trunk/drivers/staging/gdm72xx/gdm_sdio.c b/trunk/drivers/staging/gdm72xx/gdm_sdio.c index 3e43c012ef27..ec64d94cd68c 100644 --- a/trunk/drivers/staging/gdm72xx/gdm_sdio.c +++ b/trunk/drivers/staging/gdm72xx/gdm_sdio.c @@ -62,12 +62,10 @@ static struct sdio_tx *alloc_tx_struct(struct tx_cxt *tx) { struct sdio_tx *t = NULL; - t = kmalloc(sizeof(*t), GFP_ATOMIC); + t = kzalloc(sizeof(*t), GFP_ATOMIC); if (t == NULL) goto out; - memset(t, 0, sizeof(*t)); - t->buf = kmalloc(TX_BUF_SIZE, GFP_ATOMIC); if (t->buf == NULL) goto out; diff --git a/trunk/drivers/staging/gdm72xx/gdm_usb.c b/trunk/drivers/staging/gdm72xx/gdm_usb.c index d48d49c145ee..c7a22fa55638 100644 --- a/trunk/drivers/staging/gdm72xx/gdm_usb.c +++ b/trunk/drivers/staging/gdm72xx/gdm_usb.c @@ -75,12 +75,10 @@ static struct usb_tx *alloc_tx_struct(struct tx_cxt *tx) { struct usb_tx *t = NULL; - t = kmalloc(sizeof(*t), GFP_ATOMIC); + t = kzalloc(sizeof(*t), GFP_ATOMIC); if (t == NULL) goto out; - memset(t, 0, sizeof(*t)); - t->urb = usb_alloc_urb(0, GFP_ATOMIC); t->buf = kmalloc(TX_BUF_SIZE, GFP_ATOMIC); if (t->urb == NULL || t->buf == NULL)