summaryrefslogtreecommitdiffstats
path: root/drivers/staging/greybus/core.c
diff options
context:
space:
mode:
authorViresh Kumar <viresh.kumar@linaro.org>2015-07-03 17:00:29 +0530
committerGreg Kroah-Hartman <gregkh@google.com>2015-07-08 11:44:25 -0700
commitab69c4cea3b4ddf6bce4db810db37a3911b08e15 (patch)
tree2b5112a91b53278c8d80bf10eac0d15d84a0c2ab /drivers/staging/greybus/core.c
parent87c016ee908b8727f8d812bf3a36844be20d3410 (diff)
greybus: svc: SVC is part of greybus core
Its an essential part of greybus core and shouldn't be present as a separate module. Make it part of greybus.ko module. Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Diffstat (limited to 'drivers/staging/greybus/core.c')
-rw-r--r--drivers/staging/greybus/core.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/staging/greybus/core.c b/drivers/staging/greybus/core.c
index 8d16e10b7e94..925e1dc00eff 100644
--- a/drivers/staging/greybus/core.c
+++ b/drivers/staging/greybus/core.c
@@ -280,8 +280,16 @@ static int __init gb_init(void)
goto error_control;
}
+ retval = gb_svc_protocol_init();
+ if (retval) {
+ pr_err("gb_svc_protocol_init failed\n");
+ goto error_svc;
+ }
+
return 0; /* Success */
+error_svc:
+ gb_control_protocol_exit();
error_control:
gb_endo_exit();
error_endo:
@@ -299,6 +307,7 @@ module_init(gb_init);
static void __exit gb_exit(void)
{
+ gb_svc_protocol_exit();
gb_control_protocol_exit();
gb_endo_exit();
gb_operation_exit();