| From foo@baz Wed Dec 6 18:04:41 CET 2017 |
| From: Bryan O'Donoghue <pure.logic@nexus-software.ie> |
| Date: Mon, 6 Nov 2017 01:32:20 +0000 |
| Subject: staging: greybus: loopback: Fix iteration count on async path |
| |
| From: Bryan O'Donoghue <pure.logic@nexus-software.ie> |
| |
| |
| [ Upstream commit 44b02da39210e6dd67e39ff1f48d30c56d384240 ] |
| |
| Commit 12927835d211 ("greybus: loopback: Add asynchronous bi-directional |
| support") does what it says on the tin - namely, adds support for |
| asynchronous bi-directional loopback operations. |
| |
| What it neglects to do though is increment the per-connection |
| gb->iteration_count on an asynchronous operation error. This patch fixes |
| that omission. |
| |
| Fixes: 12927835d211 ("greybus: loopback: Add asynchronous bi-directional support") |
| |
| Signed-off-by: Bryan O'Donoghue <pure.logic@nexus-software.ie> |
| Reported-by: Mitch Tasman <tasman@leaflabs.com> |
| Reviewed-by: Johan Hovold <johan@kernel.org> |
| Cc: Alex Elder <elder@kernel.org> |
| Cc: Mitch Tasman <tasman@leaflabs.com> |
| Cc: greybus-dev@lists.linaro.org |
| Cc: devel@driverdev.osuosl.org |
| Cc: linux-kernel@vger.kernel.org |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| Signed-off-by: Sasha Levin <alexander.levin@verizon.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/staging/greybus/loopback.c | 4 +++- |
| 1 file changed, 3 insertions(+), 1 deletion(-) |
| |
| --- a/drivers/staging/greybus/loopback.c |
| +++ b/drivers/staging/greybus/loopback.c |
| @@ -1042,8 +1042,10 @@ static int gb_loopback_fn(void *data) |
| else if (type == GB_LOOPBACK_TYPE_SINK) |
| error = gb_loopback_async_sink(gb, size); |
| |
| - if (error) |
| + if (error) { |
| gb->error++; |
| + gb->iteration_count++; |
| + } |
| } else { |
| /* We are effectively single threaded here */ |
| if (type == GB_LOOPBACK_TYPE_PING) |