Merge remote-tracking branch 'origin/release' into stable

Change-Id: I08b51226675178ae62fa93c91bc8dd04d18bd62f

1 files changed, 7 insertions, 2 deletions

diff --git a/src/serialport/qserialport_win.cpp b/src/serialport/qserialport_win.cpp
index bbc3e8c..e8d4d62 100644
--- a/src/serialport/qserialport_win.cpp
+++ b/src/serialport/qserialport_win.cpp
@@ -146,9 +146,14 @@ public:
         // Check for unexpected event. This event triggered when pulled previously
         // opened device from the system, when opened as for not to read and not to
         // write options and so forth.
-        if ((triggeredEventMask == 0)
-                || ((originalEventMask & triggeredEventMask) == 0)) {
+        if (triggeredEventMask == 0)
             error = true;
+
+        // Workaround for standard CDC ACM serial ports, for which triggered an
+        // unexpected event EV_TXEMPTY at data transmission.
+        if ((originalEventMask & triggeredEventMask) == 0) {
+            if ((triggeredEventMask & EV_TXEMPTY) == 0)
+                error = true;
         }
 
         // Start processing a caught error.