From c26e48918cd64bc52eef33b0c4136c4d762a6eba Mon Sep 17 00:00:00 2001 From: Milton Miller Date: Thu, 7 Jul 2005 17:56:27 -0700 Subject: [PATCH] --- yaml --- r: 4234 b: refs/heads/master c: 88de0be0c7335650326a1236bf6ca1ed265c0a1c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/char/hvsi.c | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index b39c4ab5dc11..562c05fa3304 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 70b234a40107596a713e9981c643f2717e31463f +refs/heads/master: 88de0be0c7335650326a1236bf6ca1ed265c0a1c diff --git a/trunk/drivers/char/hvsi.c b/trunk/drivers/char/hvsi.c index f1f1192ba2b5..a22aa940e01e 100644 --- a/trunk/drivers/char/hvsi.c +++ b/trunk/drivers/char/hvsi.c @@ -291,15 +291,13 @@ static void dump_packet(uint8_t *packet) dump_hex(packet, header->len); } -/* can't use hvc_get_chars because that strips CRs */ static int hvsi_read(struct hvsi_struct *hp, char *buf, int count) { unsigned long got; - if (plpar_hcall(H_GET_TERM_CHAR, hp->vtermno, 0, 0, 0, &got, - (unsigned long *)buf, (unsigned long *)buf+1) == H_Success) - return got; - return 0; + got = hvc_get_chars(hp->vtermno, buf, count); + + return got; } static void hvsi_recv_control(struct hvsi_struct *hp, uint8_t *packet,