From 70f4b307dbb505ebf743c23428c6565dfb170284 Mon Sep 17 00:00:00 2001 From: Benjamin Herrenschmidt Date: Wed, 8 May 2013 14:14:26 +1000 Subject: [PATCH] --- yaml --- r: 375552 b: refs/heads/master c: 1de1455f33709a8afd8d41d26d09739a1148105b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/powerpc/platforms/powernv/opal.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index d0ca991aa13a..5c7ee4a8c1bb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 30650239adc9e4e9439256d6988e521518dccbb3 +refs/heads/master: 1de1455f33709a8afd8d41d26d09739a1148105b diff --git a/trunk/arch/powerpc/platforms/powernv/opal.c b/trunk/arch/powerpc/platforms/powernv/opal.c index ade4463226c6..12d9846aa87e 100644 --- a/trunk/arch/powerpc/platforms/powernv/opal.c +++ b/trunk/arch/powerpc/platforms/powernv/opal.c @@ -144,6 +144,13 @@ int opal_put_chars(uint32_t vtermno, const char *data, int total_len) rc == OPAL_BUSY_EVENT || rc == OPAL_SUCCESS)) { len = total_len; rc = opal_console_write(vtermno, &len, data); + + /* Closed or other error drop */ + if (rc != OPAL_SUCCESS && rc != OPAL_BUSY && + rc != OPAL_BUSY_EVENT) { + written = total_len; + break; + } if (rc == OPAL_SUCCESS) { total_len -= len; data += len;