From: Dirk Brandewie <dirk.brandewie@gmail.com>
To: Feng Tang <feng.tang@intel.com>
Cc: "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"spi-devel-general@lists.sourceforge.net"
<spi-devel-general@lists.sourceforge.net>
Subject: Re: [PATCH 09/11] spi-dw: Fix condition in spi_dw_{writer/reader}
Date: Wed, 22 Jun 2011 20:30:02 -0700 [thread overview]
Message-ID: <4E02B33A.3060805@gmail.com> (raw)
In-Reply-To: <20110623112552.6f22c3de@feng-i7>
This patch should have been:
spi-dw: Fix condition in spi_dw_{writer/reader}
From: Dirk Brandewie <dirk.brandewie@gmail.com>
Fix the condition based on whether the current transfer has a tx/rx
buffer.
Signed-off-by: Dirk Brandewie <dirk.brandewie@gmail.com>
---
drivers/spi/spi-dw.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/spi/spi-dw.c b/drivers/spi/spi-dw.c
index 96ae4a7..0a848bc 100644
--- a/drivers/spi/spi-dw.c
+++ b/drivers/spi/spi-dw.c
@@ -193,15 +193,15 @@ static void spi_dw_writer(struct spi_dw *dws)
u16 txw = 0;
while (max--) {
- /* Set the tx word if the transfer's original "tx" is not null */
- if (dws->tx_end - dws->len) {
+ /* Set the tx word if the transfer's "tx" is not null */
+ if (dws->tx) {
if (dws->n_bytes == 1)
txw = *(u8 *)(dws->tx);
else
txw = *(u16 *)(dws->tx);
+ dws->tx += dws->n_bytes;
}
dw_writew(dws, dr, txw);
- dws->tx += dws->n_bytes;
}
}
@@ -213,13 +213,13 @@ static void spi_dw_reader(struct spi_dw *dws)
while (max--) {
rxw = dw_readw(dws, dr);
/* Care rx only if the transfer's original "rx" is not null */
- if (dws->rx_end - dws->len) {
+ if (dws->rx) {
if (dws->n_bytes == 1)
*(u8 *)(dws->rx) = rxw;
else
*(u16 *)(dws->rx) = rxw;
+ dws->rx += dws->n_bytes;
}
- dws->rx += dws->n_bytes;
}
}
next prev parent reply other threads:[~2011-06-23 3:30 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-23 2:00 [PATCH 00/11] RFC spi-dw updates dirk.brandewie
2011-06-23 2:00 ` [PATCH 01/11] spi-dw: expose platform data stucture dirk.brandewie
2011-06-23 3:47 ` Grant Likely
2011-06-23 4:00 ` Dirk Brandewie
2011-06-23 4:03 ` glikely@secretlab.ca
2011-06-23 4:37 ` Dirk Brandewie
2011-06-23 5:06 ` glikely@secretlab.ca
2011-06-23 5:16 ` Dirk Brandewie
[not found] ` <1308794413-11069-1-git-send-email-dirk.brandewie-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2011-06-23 2:00 ` [PATCH 02/11] spi-dw: update function naming convention to match file naming dirk.brandewie-Re5JQEeQqe8AvxtiuMwx3w
2011-06-23 2:00 ` [PATCH 03/11] spi-dw: change MRST prefix to generic prefix dirk.brandewie-Re5JQEeQqe8AvxtiuMwx3w
2011-06-23 2:00 ` [PATCH 04/11] spi-dw: remove unused definition dirk.brandewie-Re5JQEeQqe8AvxtiuMwx3w
2011-06-23 2:00 ` [PATCH 05/11] spi-dw: split spi_dw_enable_chip() into spi_dw_enable()/spi_dw_disable() dirk.brandewie-Re5JQEeQqe8AvxtiuMwx3w
2011-06-23 2:00 ` [PATCH 06/11] spi-dw: Force error on out of range chip select dirk.brandewie-Re5JQEeQqe8AvxtiuMwx3w
2011-06-23 3:51 ` Grant Likely
2011-06-23 4:13 ` Dirk Brandewie
2011-06-23 2:00 ` [PATCH 07/11] spi-dw: Set number of available chip selects correctly dirk.brandewie-Re5JQEeQqe8AvxtiuMwx3w
2011-06-23 3:53 ` Grant Likely
2011-06-23 2:00 ` [PATCH 08/11] spi-dw: Ensure fifo lenght is set dirk.brandewie-Re5JQEeQqe8AvxtiuMwx3w
2011-06-23 2:41 ` Feng Tang
2011-06-23 3:01 ` Dirk Brandewie
2011-06-23 3:21 ` Feng Tang
2011-06-23 3:55 ` Grant Likely
2011-06-23 4:20 ` Dirk Brandewie
2011-06-23 2:00 ` [PATCH 09/11] spi-dw: Fix condition in spi_dw_{writer/reader} dirk.brandewie-Re5JQEeQqe8AvxtiuMwx3w
2011-06-23 2:45 ` Feng Tang
2011-06-23 3:09 ` Dirk Brandewie
2011-06-23 3:25 ` Feng Tang
2011-06-23 3:30 ` Dirk Brandewie [this message]
2011-06-23 5:09 ` Feng Tang
2011-06-23 2:00 ` [PATCH 11/11] spi-dw: remove noop else clause dirk.brandewie-Re5JQEeQqe8AvxtiuMwx3w
2011-06-23 2:47 ` Feng Tang
2011-06-23 3:13 ` Dirk Brandewie
2011-06-23 2:00 ` [PATCH 10/11] spi-dw: Move checking of max_speed_hz value to be a prerequisite in spi_dw_setup dirk.brandewie
2011-06-23 2:39 ` [PATCH 00/11] RFC spi-dw updates Feng Tang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4E02B33A.3060805@gmail.com \
--to=dirk.brandewie@gmail.com \
--cc=feng.tang@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=spi-devel-general@lists.sourceforge.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).