From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38587) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YIxAN-00084Z-3d for qemu-devel@nongnu.org; Wed, 04 Feb 2015 05:26:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YIxAM-0003dD-7E for qemu-devel@nongnu.org; Wed, 04 Feb 2015 05:26:39 -0500 From: Markus Armbruster Date: Wed, 4 Feb 2015 11:26:02 +0100 Message-Id: <1423045567-29855-2-git-send-email-armbru@redhat.com> In-Reply-To: <1423045567-29855-1-git-send-email-armbru@redhat.com> References: <1423045567-29855-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH v2 1/6] onenand: g_malloc() can't fail, bury dead error handling List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org, arei.gonglei@huawei.com, thuth@linux.vnet.ibm.com Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake Reviewed-by: Gonglei --- hw/block/onenand.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/hw/block/onenand.c b/hw/block/onenand.c index 348630d..1b2c893 100644 --- a/hw/block/onenand.c +++ b/hw/block/onenand.c @@ -346,15 +346,9 @@ static inline int onenand_prog_spare(OneNANDState *s, int sec, int secn, static inline int onenand_erase(OneNANDState *s, int sec, int num) { uint8_t *blankbuf, *tmpbuf; + blankbuf = g_malloc(512); - if (!blankbuf) { - return 1; - } tmpbuf = g_malloc(512); - if (!tmpbuf) { - g_free(blankbuf); - return 1; - } memset(blankbuf, 0xff, 512); for (; num > 0; num--, sec++) { if (s->blk_cur) { -- 1.9.3