summaryrefslogtreecommitdiff
path: root/drivers/staging/irda
diff options
context:
space:
mode:
authorGreg KH <gregkh@linuxfoundation.org>2017-08-30 13:16:49 +0200
committerDavid S. Miller <davem@davemloft.net>2017-08-30 10:15:12 -0700
commit0da93d2ebb5d198a4601bd5ad7695f3c6fd36062 (patch)
treee7b52a2d56ba20f5960968999ed47bede5db525b /drivers/staging/irda
parentd081a16db80ef7a260fb178aa1199e01f7432625 (diff)
staging: irda: fix init level for irda core
When moving the IRDA code out of net/ into drivers/staging/irda/net, the link order changes when IRDA is built into the kernel. That causes a kernel crash at boot time as netfilter isn't initialized yet. To fix this, move the init call level of the irda core to be device_initcall() as the link order keeps this being initialized at the correct time. Reported-by: kernel test robot <fengguang.wu@intel.com> Reported-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/staging/irda')
-rw-r--r--drivers/staging/irda/net/irmod.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/irda/net/irmod.c b/drivers/staging/irda/net/irmod.c
index c5e35b85c477..4319f4ff66b0 100644
--- a/drivers/staging/irda/net/irmod.c
+++ b/drivers/staging/irda/net/irmod.c
@@ -190,7 +190,7 @@ static void __exit irda_cleanup(void)
*
* Jean II
*/
-subsys_initcall(irda_init);
+device_initcall(irda_init);
module_exit(irda_cleanup);
MODULE_AUTHOR("Dag Brattli <dagb@cs.uit.no> & Jean Tourrilhes <jt@hpl.hp.com>");