From 96e1897c3b67a883b18897ae90907e4b2e019f49 Mon Sep 17 00:00:00 2001
From: Giovanni Di Sirio <gdisirio@gmail.com>
Date: Tue, 5 Sep 2017 12:12:36 +0000
Subject: [PATCH] Fixed bug #883.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_17.6.x@10559 35acf78f-673a-0410-8e92-d51de3d6d3f4
---
 os/hal/src/hal_uart.c | 4 ++--
 readme.txt            | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/os/hal/src/hal_uart.c b/os/hal/src/hal_uart.c
index 8df77adb5..89276f28f 100644
--- a/os/hal/src/hal_uart.c
+++ b/os/hal/src/hal_uart.c
@@ -384,7 +384,7 @@ msg_t uartSendTimeout(UARTDriver *uartp, size_t *np,
   /* Waiting for result.*/
   msg = osalThreadSuspendTimeoutS(&uartp->threadtx, timeout);
   if (msg != MSG_OK) {
-    *np = uartStopSendI(uartp);
+    *np -= uartStopSendI(uartp);
   }
   osalSysUnlock();
 
@@ -475,7 +475,7 @@ msg_t uartReceiveTimeout(UARTDriver *uartp, size_t *np,
   /* Waiting for result.*/
   msg = osalThreadSuspendTimeoutS(&uartp->threadrx, timeout);
   if (msg != MSG_OK) {
-    *np = uartStopReceiveI(uartp);
+    *np -= uartStopReceiveI(uartp);
   }
   osalSysUnlock();
 
diff --git a/readme.txt b/readme.txt
index ec4d0951b..7703f3348 100644
--- a/readme.txt
+++ b/readme.txt
@@ -89,6 +89,7 @@
 *****************************************************************************
 
 *** 17.6.1 ***
+- HAL: Fixed error in uartReceiveTimeout() and uartSendTimeout() (bug #883).
 - HAL: Fixed TIMx DBL field macro broken (bug #880).
 - HAL: Fixed STM32 SPI problem in spi_lld_start() (bug #879).
 - HAL: Fixed invalid STM32 CAN3 filters initialization (bug #878).