diff options
author | Martin Braun <martin.braun@ettus.com> | 2016-03-11 09:46:29 -0800 |
---|---|---|
committer | Martin Braun <martin.braun@ettus.com> | 2016-03-11 09:46:29 -0800 |
commit | 94230735279c721424ef001a799c780dc937a091 (patch) | |
tree | c476b516144b76730cc18788cba2b0c712a917b2 /host/lib/usrp/usrp2 | |
parent | 165fd400e995c9652c2dfe85c2fd589b750a2620 (diff) | |
parent | ccc8acb743aaab6cd3e926d5901fa3fa4114a469 (diff) | |
download | uhd-94230735279c721424ef001a799c780dc937a091.tar.gz uhd-94230735279c721424ef001a799c780dc937a091.tar.bz2 uhd-94230735279c721424ef001a799c780dc937a091.zip |
Merge branch 'maint'
Diffstat (limited to 'host/lib/usrp/usrp2')
-rw-r--r-- | host/lib/usrp/usrp2/n200_image_loader.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/host/lib/usrp/usrp2/n200_image_loader.cpp b/host/lib/usrp/usrp2/n200_image_loader.cpp index 29bec8b4a..d6acfe39d 100644 --- a/host/lib/usrp/usrp2/n200_image_loader.cpp +++ b/host/lib/usrp/usrp2/n200_image_loader.cpp @@ -1,5 +1,5 @@ // -// Copyright 2015 Ettus Research LLC +// Copyright 2015-2016 Ettus Research LLC // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -201,7 +201,7 @@ static UHD_INLINE bool n200_response_matches(const n200_fw_update_data_t *pkt_in n200_fw_update_id_t pkt_code, size_t len){ return (len > offsetof(n200_fw_update_data_t, data) and - ntohl(pkt_in->id) == pkt_code); + ntohl(pkt_in->id) == (unsigned)pkt_code); } static uhd::device_addr_t n200_find(const image_loader::image_loader_args_t &image_loader_args){ |