From 5c34eeeaf808a4538f4cbf723f2cddfab1c6c00d Mon Sep 17 00:00:00 2001 From: Marc Pignat Date: Tue, 4 Dec 2007 23:45:10 -0800 Subject: [PATCH] --- yaml --- r: 74589 b: refs/heads/master c: 9b938b749065d6a94172ac24d9748bd66a03da4c h: refs/heads/master i: 74587: fe16d6a6a48e41b0ef734ba6798c72126b6009eb v: v3 --- [refs] | 2 +- trunk/drivers/spi/spi.c | 13 +++++-------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 5689d9458f27..ef12c7d149e5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3f86f14c0fc9fdb0984e64209df2f47895a07151 +refs/heads/master: 9b938b749065d6a94172ac24d9748bd66a03da4c diff --git a/trunk/drivers/spi/spi.c b/trunk/drivers/spi/spi.c index 6ca07c9929e6..93e9de46977a 100644 --- a/trunk/drivers/spi/spi.c +++ b/trunk/drivers/spi/spi.c @@ -541,10 +541,7 @@ static void spi_complete(void *arg) * Also, the caller is guaranteeing that the memory associated with the * message will not be freed before this call returns. * - * The return value is a negative error code if the message could not be - * submitted, else zero. When the value is zero, then message->status is - * also defined; it's the completion code for the transfer, either zero - * or a negative error code from the controller driver. + * It returns zero on success, else a negative error code. */ int spi_sync(struct spi_device *spi, struct spi_message *message) { @@ -554,8 +551,10 @@ int spi_sync(struct spi_device *spi, struct spi_message *message) message->complete = spi_complete; message->context = &done; status = spi_async(spi, message); - if (status == 0) + if (status == 0) { wait_for_completion(&done); + status = message->status; + } message->context = NULL; return status; } @@ -628,10 +627,8 @@ int spi_write_then_read(struct spi_device *spi, /* do the i/o */ status = spi_sync(spi, &message); - if (status == 0) { + if (status == 0) memcpy(rxbuf, x[1].rx_buf, n_rx); - status = message.status; - } if (x[0].tx_buf == buf) mutex_unlock(&lock);