spi: fix race freeing dummy_tx/rx before it is unmapped

[firefly-linux-kernel-4.4.55.git] / drivers / spi / spi.c

diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index 50910d85df5af28d6f281485cc79d4b3e15bc7e5..d35c1a13217c542cfa8bab98a72fc751096850cb 100644 (file)
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -988,9 +988,6 @@ void spi_finalize_current_message(struct spi_master *master)
 
        spin_lock_irqsave(&master->queue_lock, flags);
        mesg = master->cur_msg;
-       master->cur_msg = NULL;
-
-       queue_kthread_work(&master->kworker, &master->pump_messages);
        spin_unlock_irqrestore(&master->queue_lock, flags);
 
        spi_unmap_msg(master, mesg);
@@ -1003,9 +1000,13 @@ void spi_finalize_current_message(struct spi_master *master)
                }
        }
 
-       trace_spi_message_done(mesg);
-
+       spin_lock_irqsave(&master->queue_lock, flags);
+       master->cur_msg = NULL;
        master->cur_msg_prepared = false;
+       queue_kthread_work(&master->kworker, &master->pump_messages);
+       spin_unlock_irqrestore(&master->queue_lock, flags);
+
+       trace_spi_message_done(mesg);
 
        mesg->state = NULL;
        if (mesg->complete)