diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2015-03-18 11:27:28 +0100 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2015-04-16 20:13:13 -0400 |
| commit | ea4e289c2847a4fbcb140295e3fd60ec5b5c8052 (patch) | |
| tree | 17553de70f54aba3e2fe58b86b6fe9499a46d5b9 | |
| parent | 7cc582d4ae5dd15351fdb9cd7e0e34462b09c2f9 (diff) | |
spi: trigger trace event for message-done before mesg->complete
[ Upstream commit 391949b6f02121371e3d7d9082c6d17fd9853034 ]
With spidev the mesg->complete callback points to spidev_complete.
Calling this unblocks spidev_sync and so spidev_sync_write finishes. As
the struct spi_message just read is a local variable in
spidev_sync_write and recording the trace event accesses this message
the recording is better done first. The same can happen for
spidev_sync_read.
This fixes an oops observed on a 3.14-rt system with spidev activity
after
echo 1 > /sys/kernel/debug/tracing/events/spi/enable
.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Mark Brown <broonie@kernel.org>
Cc: stable@vger.kernel.org
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
| -rw-r--r-- | drivers/spi/spi.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index 50f20f243981..1c72be19e70e 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -1073,13 +1073,14 @@ void spi_finalize_current_message(struct spi_master *master) "failed to unprepare message: %d\n", ret); } } + + trace_spi_message_done(mesg); + master->cur_msg_prepared = false; mesg->state = NULL; if (mesg->complete) mesg->complete(mesg->context); - - trace_spi_message_done(mesg); } EXPORT_SYMBOL_GPL(spi_finalize_current_message); |