From: Adrian Bunk Fix a memory leak spotted by the Coverity checker if (!try_module_get(owner)). Signed-off-by: Adrian Bunk Acked-by: Tilman Schmidt Signed-off-by: Andrew Morton --- drivers/isdn/gigaset/common.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff -puN drivers/isdn/gigaset/common.c~isdn-gigaset-commonc-fix-a-memory-leak drivers/isdn/gigaset/common.c --- devel/drivers/isdn/gigaset/common.c~isdn-gigaset-commonc-fix-a-memory-leak 2006-04-05 21:28:24.000000000 -0700 +++ devel-akpm/drivers/isdn/gigaset/common.c 2006-04-05 21:28:24.000000000 -0700 @@ -1110,8 +1110,9 @@ struct gigaset_driver *gigaset_initdrive drv = kmalloc(sizeof *drv, GFP_KERNEL); if (!drv) return NULL; + if (!try_module_get(owner)) - return NULL; + goto out1; drv->cs = NULL; drv->have_tty = 0; @@ -1125,10 +1126,11 @@ struct gigaset_driver *gigaset_initdrive drv->cs = kmalloc(minors * sizeof *drv->cs, GFP_KERNEL); if (!drv->cs) - goto out1; + goto out2; + drv->flags = kmalloc(minors * sizeof *drv->flags, GFP_KERNEL); if (!drv->flags) - goto out2; + goto out3; for (i = 0; i < minors; ++i) { drv->flags[i] = 0; @@ -1145,11 +1147,12 @@ struct gigaset_driver *gigaset_initdrive return drv; -out2: +out3: kfree(drv->cs); +out2: + module_put(owner); out1: kfree(drv); - module_put(owner); return NULL; } EXPORT_SYMBOL_GPL(gigaset_initdriver); _