diff options
| author | Igor Mammedov <niallain@gmail.com> | 2008-04-28 19:08:21 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-04-28 19:08:21 -0400 |
| commit | e9f20d6f03e8df393b001dab6dc5226c2a5daf57 (patch) | |
| tree | 73e94fa5e4f83576c97e36187b809c5aad2ade30 /drivers/spi/atmel_spi.c | |
| parent | bf62fd887cab230f5952b611bde25e8e15acb454 (diff) | |
| parent | e31a94ed371c70855eb30b77c490d6d85dd4da26 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/spi/atmel_spi.c')
| -rw-r--r-- | drivers/spi/atmel_spi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/atmel_spi.c b/drivers/spi/atmel_spi.c index 1749a27be066..02c8e305b14f 100644 --- a/drivers/spi/atmel_spi.c +++ b/drivers/spi/atmel_spi.c | |||
| @@ -616,7 +616,7 @@ static int atmel_spi_transfer(struct spi_device *spi, struct spi_message *msg) | |||
| 616 | return -ESHUTDOWN; | 616 | return -ESHUTDOWN; |
| 617 | 617 | ||
| 618 | list_for_each_entry(xfer, &msg->transfers, transfer_list) { | 618 | list_for_each_entry(xfer, &msg->transfers, transfer_list) { |
| 619 | if (!(xfer->tx_buf || xfer->rx_buf)) { | 619 | if (!(xfer->tx_buf || xfer->rx_buf) && xfer->len) { |
| 620 | dev_dbg(&spi->dev, "missing rx or tx buf\n"); | 620 | dev_dbg(&spi->dev, "missing rx or tx buf\n"); |
| 621 | return -EINVAL; | 621 | return -EINVAL; |
| 622 | } | 622 | } |