Merge remote-tracking branch 'upstream/master'

2012-07-06 11:14:47 +02:00
parent ec50ab9286 d7f63586c6
commit 6b2d43617f
5 changed files with 37 additions and 10 deletions
--- a/bin/mbus-tcp-request-data-multi-reply.c
+++ b/bin/mbus-tcp-request-data-multi-reply.c
@ -136,7 +136,7 @@ main(int argc, char **argv)
    
    // instead of the send and recv, use this sendrecv function that 
    // takes care of the possibility of multi-telegram replies (limit = 16 frames)
-    if (mbus_sendrecv_request(handle, address, &reply, 16) == -1)
+    if (mbus_sendrecv_request(handle, address, &reply, 16) != 0)
    {
        fprintf(stderr, "Failed to send/receive M-Bus request.\n");
        return 1;