OSDN Git Service

powerpc/powernv: opal_put_chars partial write fix
authorNicholas Piggin <npiggin@gmail.com>
Mon, 30 Apr 2018 14:55:44 +0000 (00:55 +1000)
committerMichael Ellerman <mpe@ellerman.id.au>
Tue, 24 Jul 2018 12:09:54 +0000 (22:09 +1000)
The intention here is to consume and discard the remaining buffer
upon error. This works if there has not been a previous partial write.
If there has been, then total_len is no longer total number of bytes
to copy. total_len is always "bytes left to copy", so it should be
added to written bytes.

This code may not be exercised any more if partial writes will not be
hit, but this is a small bugfix before a larger change.

Reviewed-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
arch/powerpc/platforms/powernv/opal.c

index 0d539c6..371e33e 100644 (file)
@@ -388,7 +388,7 @@ int opal_put_chars(uint32_t vtermno, const char *data, int total_len)
                /* Closed or other error drop */
                if (rc != OPAL_SUCCESS && rc != OPAL_BUSY &&
                    rc != OPAL_BUSY_EVENT) {
-                       written = total_len;
+                       written += total_len;
                        break;
                }
                if (rc == OPAL_SUCCESS) {