diff options
| author | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2011-01-06 17:04:50 +0000 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-01-07 11:03:26 +0900 |
| commit | 661382fe190475c17d0b3a6b5f0350b4f82f5939 (patch) | |
| tree | 3609fdecc5b29a6875cbe92cca747096819db7b4 | |
| parent | 3c0cb7c31c206aaedb967e44b98442bbeb17a6c4 (diff) | |
| download | op-kernel-dev-661382fe190475c17d0b3a6b5f0350b4f82f5939.zip op-kernel-dev-661382fe190475c17d0b3a6b5f0350b4f82f5939.tar.gz | |
dma: shdma: don't register the global die notifier multiple times
A recent patch has added a die notifier to the shdma driver, however,
it registers a static die-notifier object in the probe routine, i.e.,
for each device instance. This is wrong and leads to a system lockup.
This patch moves the die notifier registration to module init and
exit routines respectively.
Reported-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| -rw-r--r-- | drivers/dma/shdma.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/drivers/dma/shdma.c b/drivers/dma/shdma.c index a0069c1..28720d3 100644 --- a/drivers/dma/shdma.c +++ b/drivers/dma/shdma.c @@ -1110,11 +1110,6 @@ static int __init sh_dmae_probe(struct platform_device *pdev) list_add_tail_rcu(&shdev->node, &sh_dmae_devices); spin_unlock_irqrestore(&sh_dmae_lock, flags); - /* Wire up NMI handling before bringing the controller online */ - err = register_die_notifier(&sh_dmae_nmi_notifier); - if (err) - goto notifier_err; - /* reset dma controller */ err = sh_dmae_rst(shdev); if (err) @@ -1218,8 +1213,6 @@ eirqres: eirq_err: #endif rst_err: - unregister_die_notifier(&sh_dmae_nmi_notifier); -notifier_err: spin_lock_irqsave(&sh_dmae_lock, flags); list_del_rcu(&shdev->node); spin_unlock_irqrestore(&sh_dmae_lock, flags); @@ -1252,8 +1245,6 @@ static int __exit sh_dmae_remove(struct platform_device *pdev) if (errirq > 0) free_irq(errirq, shdev); - unregister_die_notifier(&sh_dmae_nmi_notifier); - spin_lock_irqsave(&sh_dmae_lock, flags); list_del_rcu(&shdev->node); spin_unlock_irqrestore(&sh_dmae_lock, flags); @@ -1296,6 +1287,11 @@ static struct platform_driver sh_dmae_driver = { static int __init sh_dmae_init(void) { + /* Wire up NMI handling */ + int err = register_die_notifier(&sh_dmae_nmi_notifier); + if (err) + return err; + return platform_driver_probe(&sh_dmae_driver, sh_dmae_probe); } module_init(sh_dmae_init); @@ -1303,6 +1299,8 @@ module_init(sh_dmae_init); static void __exit sh_dmae_exit(void) { platform_driver_unregister(&sh_dmae_driver); + + unregister_die_notifier(&sh_dmae_nmi_notifier); } module_exit(sh_dmae_exit); |
