diff --git a/[refs] b/[refs]
index 8b7bbda2b9c9..78cbd73c5047 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e85dea0e415617b5c5627f38c71b33fbc7f94a85
+refs/heads/master: 9e890ad880be1dd98483313b2ec0e23fbd4e3792
diff --git a/trunk/drivers/s390/cio/qdio_thinint.c b/trunk/drivers/s390/cio/qdio_thinint.c
index c7c5512a892e..96f0095f568d 100644
--- a/trunk/drivers/s390/cio/qdio_thinint.c
+++ b/trunk/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);
 }