summaryrefslogtreecommitdiffstats
path: root/drivers/staging/greybus/module.c
diff options
context:
space:
mode:
authorViresh Kumar2014-11-13 13:44:37 +0100
committerGreg Kroah-Hartman2014-11-14 22:17:55 +0100
commit0a68a16b914472aa3c9dbac81df501b9c8dffb86 (patch)
treea22393d12c42c2891b3c5d188fcfb1278095aebd /drivers/staging/greybus/module.c
parentgreybus: sysfs: generalize gb_module_attr() to capture more cases (diff)
downloadkernel-qcow2-linux-0a68a16b914472aa3c9dbac81df501b9c8dffb86.tar.gz
kernel-qcow2-linux-0a68a16b914472aa3c9dbac81df501b9c8dffb86.tar.xz
kernel-qcow2-linux-0a68a16b914472aa3c9dbac81df501b9c8dffb86.zip
greybus: module: free resources properly on failures
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> Reviewed-by: Alex Elder <elder@linaro.org> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
Diffstat (limited to 'drivers/staging/greybus/module.c')
-rw-r--r--drivers/staging/greybus/module.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/staging/greybus/module.c b/drivers/staging/greybus/module.c
index f5d7dc84c1d1..8cbe65b0c01a 100644
--- a/drivers/staging/greybus/module.c
+++ b/drivers/staging/greybus/module.c
@@ -85,10 +85,6 @@ struct gb_module *gb_module_create(struct greybus_host_device *hd, u8 module_id)
gmod->module_id = module_id;
INIT_LIST_HEAD(&gmod->interfaces);
- spin_lock_irq(&gb_modules_lock);
- list_add_tail(&gmod->links, &hd->modules);
- spin_unlock_irq(&gb_modules_lock);
-
gmod->dev.parent = hd->parent;
gmod->dev.bus = &greybus_bus_type;
gmod->dev.type = &greybus_module_type;
@@ -102,9 +98,14 @@ struct gb_module *gb_module_create(struct greybus_host_device *hd, u8 module_id)
pr_err("failed to add module device for id 0x%02hhx\n",
module_id);
put_device(&gmod->dev);
+ kfree(gmod);
return NULL;
}
+ spin_lock_irq(&gb_modules_lock);
+ list_add_tail(&gmod->links, &hd->modules);
+ spin_unlock_irq(&gb_modules_lock);
+
return gmod;
}