From 442dcce97329e8fd3bc6d40fdeac4cfb262cf799 Mon Sep 17 00:00:00 2001 From: Peter Senna Tschudin Date: Wed, 12 Sep 2012 17:06:44 +0200 Subject: [PATCH] --- yaml --- r: 325223 b: refs/heads/master c: 47ad3428a1086af425447f763705e06b16ae905d h: refs/heads/master i: 325221: cbacc193d179f49bbd15bf08d3c7fe17578acc1b 325219: 60a0b5f5576d10c3b42a8ce08644551e846484de 325215: fe98d3bc84d3391503a7671231005ecdb730a516 v: v3 --- [refs] | 2 +- trunk/drivers/staging/gdm72xx/gdm_sdio.c | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 8ca4467f8bfa..bab55807bdea 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2e464f00687931eeeab95c90e3796609d0c8ce4c +refs/heads/master: 47ad3428a1086af425447f763705e06b16ae905d diff --git a/trunk/drivers/staging/gdm72xx/gdm_sdio.c b/trunk/drivers/staging/gdm72xx/gdm_sdio.c index f8242902ada6..a0621d9c2198 100644 --- a/trunk/drivers/staging/gdm72xx/gdm_sdio.c +++ b/trunk/drivers/staging/gdm72xx/gdm_sdio.c @@ -94,17 +94,14 @@ static struct sdio_rx *alloc_rx_struct(struct rx_cxt *rx) struct sdio_rx *r = NULL; r = kmalloc(sizeof(*r), GFP_ATOMIC); - if (r == NULL) - goto out; + if (!r) + return NULL; memset(r, 0, sizeof(*r)); r->rx_cxt = rx; return r; -out: - kfree(r); - return NULL; } static void free_rx_struct(struct sdio_rx *r)