summaryrefslogtreecommitdiff
path: root/drivers/s390/cio
diff options
context:
space:
mode:
authorJan Glauber <jang@linux.vnet.ibm.com>2009-03-26 15:24:30 +0100
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2009-03-26 15:24:21 +0100
commit9e890ad880be1dd98483313b2ec0e23fbd4e3792 (patch)
tree30c45a05b7d00ed418e5bfa2fe355fc68916f075 /drivers/s390/cio
parente85dea0e415617b5c5627f38c71b33fbc7f94a85 (diff)
downloadlinux-3.10-9e890ad880be1dd98483313b2ec0e23fbd4e3792.tar.gz
linux-3.10-9e890ad880be1dd98483313b2ec0e23fbd4e3792.tar.bz2
linux-3.10-9e890ad880be1dd98483313b2ec0e23fbd4e3792.zip
[S390] qdio: tasklet termination in case of module unload
If the qdio module is unloaded the tiqdio tasklet must be terminated by tasklet_kill. Move the tasklet_kill after the unregistration of the adapter interrupt so the tiqdio tasklet will not be scheduled anymore before calling tasklet_kill. Signed-off-by: Jan Glauber <jang@linux.vnet.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'drivers/s390/cio')
-rw-r--r--drivers/s390/cio/qdio_thinint.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/s390/cio/qdio_thinint.c b/drivers/s390/cio/qdio_thinint.c
index c7c5512a892..96f0095f568 100644
--- a/drivers/s390/cio/qdio_thinint.c
+++ b/drivers/s390/cio/qdio_thinint.c
@@ -370,10 +370,11 @@ void qdio_shutdown_thinint(struct qdio_irq *irq_ptr)
void __exit tiqdio_unregister_thinints(void)
{
- tasklet_disable(&tiqdio_tasklet);
+ WARN_ON(!list_empty(&tiq_list));
if (tiqdio_alsi) {
s390_unregister_adapter_interrupt(tiqdio_alsi, QDIO_AIRQ_ISC);
isc_unregister(QDIO_AIRQ_ISC);
}
+ tasklet_kill(&tiqdio_tasklet);
}