diff options
author | Bdale Garbee <bdale@gag.com> | 2015-07-16 13:31:42 -0600 |
---|---|---|
committer | Bdale Garbee <bdale@gag.com> | 2015-07-16 13:31:42 -0600 |
commit | 6e9bb9178356620bd47d9f2e31abf42b7f1a8f11 (patch) | |
tree | 6f04b5500462d1f6e26ebcba58c5e9cd56afd442 /ao-tools/lib/cc-usb.c | |
parent | e2cefd8593d269ce603aaf33f4a53a5c2dcb3350 (diff) | |
parent | 87c8bb3956897830da1f7aaca2990a9571767b73 (diff) |
Merge branch 'master' into branch-1.6
Diffstat (limited to 'ao-tools/lib/cc-usb.c')
-rw-r--r-- | ao-tools/lib/cc-usb.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ao-tools/lib/cc-usb.c b/ao-tools/lib/cc-usb.c index 1a4dc7a1..1e023c7e 100644 --- a/ao-tools/lib/cc-usb.c +++ b/ao-tools/lib/cc-usb.c @@ -207,8 +207,10 @@ _cc_usb_sync(struct cc_usb *cc, int wait_for_input, int write_timeout) write(2, cc->in_buf, cc->in_count); cc->in_count = 0; } - } else if (ret < 0) + } else if (ret <= 0) { perror("read"); + return -1; + } } if (fds.revents & POLLOUT) { ret = write(cc->fd, cc->out_buf, |