Merge tag 'hsi-for-3.16-fixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi

Pull HSI build fixes from Sebastian Reichel:
 - tighten dependency between ssi-protocol and omap-ssi to fix build
   failures with randconfig.
 - use normal module refcounting in omap driver to fix build with
   disabled module support

* tag 'hsi-for-3.16-fixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi:
  hsi: omap_ssi_port: use normal module refcounting
  HSI: fix omap ssi driver dependency

2 files changed, 3 insertions, 3 deletions

diff --git a/drivers/hsi/clients/Kconfig b/drivers/hsi/clients/Kconfig
index 71b9f9ab86e4..bc60dec3f586 100644
--- a/drivers/hsi/clients/Kconfig
+++ b/drivers/hsi/clients/Kconfig
@@ -15,7 +15,7 @@ config NOKIA_MODEM
 
 config SSI_PROTOCOL
         tristate "SSI protocol"
-        depends on HSI && PHONET && (OMAP_SSI=y || OMAP_SSI=m)
+        depends on HSI && PHONET && OMAP_SSI
         help
         If you say Y here, you will enable the SSI protocol aka McSAAB.
 
diff --git a/drivers/hsi/controllers/omap_ssi_port.c b/drivers/hsi/controllers/omap_ssi_port.c
index b8693f0b27fe..29aea0b93360 100644
--- a/drivers/hsi/controllers/omap_ssi_port.c
+++ b/drivers/hsi/controllers/omap_ssi_port.c
@@ -1116,8 +1116,7 @@ static int __init ssi_port_probe(struct platform_device *pd)
 
         dev_dbg(&pd->dev, "init ssi port...\n");
 
-        err = ref_module(THIS_MODULE, ssi->owner);
-        if (err) {
+        if (!try_module_get(ssi->owner)) {
                 dev_err(&pd->dev, "could not increment parent module refcount (err=%d)\n",
                         err);
                 return -ENODEV;
@@ -1254,6 +1253,7 @@ static int __exit ssi_port_remove(struct platform_device *pd)
 
         omap_ssi->port[omap_port->port_id] = NULL;
         platform_set_drvdata(pd, NULL);
+        module_put(ssi->owner);
         pm_runtime_disable(&pd->dev);
 
         return 0;