From: Dan Carpenter Date: Tue, 18 Feb 2014 12:18:10 +0000 (+0300) Subject: staging: gdm724x: cleanup alloc_tx_sdu_struct() X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=75bc5fad154590e8dda5772669cf9b6f44bb873b;p=openwrt%2Fstaging%2Fblogic.git staging: gdm724x: cleanup alloc_tx_sdu_struct() The kfree(t_sdu->buf) sets off a private static checker warning because "t_sdu->buf" is always NULL. This function just allocates two pointers so we can re-write it to be simpler. Signed-off-by: Dan Carpenter Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/gdm724x/gdm_usb.c b/drivers/staging/gdm724x/gdm_usb.c index 33458a583142..03b43056fcf2 100644 --- a/drivers/staging/gdm724x/gdm_usb.c +++ b/drivers/staging/gdm724x/gdm_usb.c @@ -119,28 +119,15 @@ out: static struct usb_tx_sdu *alloc_tx_sdu_struct(void) { - struct usb_tx_sdu *t_sdu = NULL; - int ret = 0; - + struct usb_tx_sdu *t_sdu; t_sdu = kzalloc(sizeof(struct usb_tx_sdu), GFP_ATOMIC); - if (!t_sdu) { - ret = -ENOMEM; - goto out; - } + if (!t_sdu) + return NULL; t_sdu->buf = kmalloc(SDU_BUF_SIZE, GFP_ATOMIC); if (!t_sdu->buf) { - ret = -ENOMEM; - goto out; - } -out: - - if (ret < 0) { - if (t_sdu) { - kfree(t_sdu->buf); - kfree(t_sdu); - } + kfree(t_sdu); return NULL; }