diff options
author | Takashi Iwai <tiwai@suse.de> | 2015-04-08 09:29:56 (GMT) |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2015-04-08 09:30:49 (GMT) |
commit | 0a599838737a2527c35e4d94f794aefe59df1781 (patch) | |
tree | b1f7571949527c459ca5e27bd420518e905c8b27 /drivers/spi/spi.c | |
parent | 2d846c74027231264e57e4e34faf9576394e3ce0 (diff) | |
parent | a59d7199f62b8336570972dcc288321d0ec999fe (diff) | |
download | linux-0a599838737a2527c35e4d94f794aefe59df1781.tar.xz |
Merge branch 'for-linus' into for-next
Back merge HD-audio quirks to for-next branch, so that we can apply
a couple of more quirks.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'drivers/spi/spi.c')
-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 c64a3e5..57a1950 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -1105,13 +1105,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); |