From: Sebastian Andrzej Siewior <bige...@linutronix.de>

tasklet_disable() is invoked in several places. Some of them are in atomic
context which prevents a conversion of tasklet_disable() to a sleepable
function.

The atomic callchains are:

 ar_context_tasklet()
   ohci_cancel_packet()
     tasklet_disable()

 ...
   ohci_flush_iso_completions()
     tasklet_disable()

The invocation of tasklet_disable() from at_context_flush() is always in
preemptible context.

Use tasklet_disable_in_atomic() for the two invocations in
ohci_cancel_packet() and ohci_flush_iso_completions().

Signed-off-by: Sebastian Andrzej Siewior <bige...@linutronix.de>
Signed-off-by: Thomas Gleixner <t...@linutronix.de>
Cc: Stefan Richter <stef...@s5r6.in-berlin.de>
Cc: linux1394-de...@lists.sourceforge.net
---
 drivers/firewire/ohci.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- a/drivers/firewire/ohci.c
+++ b/drivers/firewire/ohci.c
@@ -2545,7 +2545,7 @@ static int ohci_cancel_packet(struct fw_
        struct driver_data *driver_data = packet->driver_data;
        int ret = -ENOENT;
 
-       tasklet_disable(&ctx->tasklet);
+       tasklet_disable_in_atomic(&ctx->tasklet);
 
        if (packet->ack != 0)
                goto out;
@@ -3465,7 +3465,7 @@ static int ohci_flush_iso_completions(st
        struct iso_context *ctx = container_of(base, struct iso_context, base);
        int ret = 0;
 
-       tasklet_disable(&ctx->context.tasklet);
+       tasklet_disable_in_atomic(&ctx->context.tasklet);
 
        if (!test_and_set_bit_lock(0, &ctx->flushing_completions)) {
                context_tasklet((unsigned long)&ctx->context);

Reply via email to