diff options
author | Axel Lin <axel.lin@ingics.com> | 2014-04-02 10:21:04 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-04-03 06:13:38 -0400 |
commit | 0a6d38795a405c49ea0012f04173613382def58c (patch) | |
tree | 41cca48cd41bdf3c9034b8f59ff5f4079f9bdaf2 /drivers/spi/spi-fsl-spi.c | |
parent | 455c6fdbd219161bd09b1165f11699d6d73de11c (diff) |
spi: Always check complete callback before calling it
Since commit 1e25cd4729bd "spi: Do not require a completion", this checking is
required to prevent NULL pointer dereference.
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'drivers/spi/spi-fsl-spi.c')
-rw-r--r-- | drivers/spi/spi-fsl-spi.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/spi/spi-fsl-spi.c b/drivers/spi/spi-fsl-spi.c index 119f7af94537..f2af3eb3ceb7 100644 --- a/drivers/spi/spi-fsl-spi.c +++ b/drivers/spi/spi-fsl-spi.c | |||
@@ -404,7 +404,8 @@ static void fsl_spi_do_one_msg(struct spi_message *m) | |||
404 | } | 404 | } |
405 | 405 | ||
406 | m->status = status; | 406 | m->status = status; |
407 | m->complete(m->context); | 407 | if (m->complete) |
408 | m->complete(m->context); | ||
408 | 409 | ||
409 | if (status || !cs_change) { | 410 | if (status || !cs_change) { |
410 | ndelay(nsecs); | 411 | ndelay(nsecs); |