Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4a54e5e5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 1ad96bb0 b357d7b5

drivers/hsi/clients/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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.

drivers/hsi/controllers/omap_ssi_port.c

+2 −2
Original line number Diff line number Diff line
@@ -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;