From: Benjamin Romer Date: Tue, 4 Nov 2014 16:25:16 +0000 (-0500) Subject: staging: unisys: refactor visor_memregion_create() X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=fef483891dc5aaca047fad7cf594651fbda9bef5;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git staging: unisys: refactor visor_memregion_create() Fix the sizeof() so it uses the variable name rather than the type, fix the argument alignment to the kzalloc(), and rename the goto label. Away => cleanup Signed-off-by: Benjamin Romer Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/unisys/visorutil/memregion_direct.c b/drivers/staging/unisys/visorutil/memregion_direct.c index 73228d2da30f..3f1f313f0deb 100644 --- a/drivers/staging/unisys/visorutil/memregion_direct.c +++ b/drivers/staging/unisys/visorutil/memregion_direct.c @@ -41,8 +41,8 @@ struct memregion * visor_memregion_create(HOSTADDRESS physaddr, ulong nbytes) { struct memregion *rc = NULL; - struct memregion *memregion = kzalloc(sizeof(struct memregion), - GFP_KERNEL | __GFP_NORETRY); + struct memregion *memregion = kzalloc(sizeof(*memregion), + GFP_KERNEL | __GFP_NORETRY); if (memregion == NULL) { ERRDRV("visor_memregion_create allocation failed"); return NULL; @@ -52,10 +52,10 @@ visor_memregion_create(HOSTADDRESS physaddr, ulong nbytes) memregion->overlapped = FALSE; if (!mapit(memregion)) { rc = NULL; - goto Away; + goto cleanup; } rc = memregion; -Away: +cleanup: if (rc == NULL) { if (memregion != NULL) { visor_memregion_destroy(memregion);