1 files changed, 7 insertions, 3 deletions
diff --git a/host/utils/uhd_cal_tx_iq_balance.cpp b/host/utils/uhd_cal_tx_iq_balance.cpp
index cff3d1646..20d018edf 100644
--- a/host/utils/uhd_cal_tx_iq_balance.cpp
+++ b/host/utils/uhd_cal_tx_iq_balance.cpp
@@ -1,5 +1,5 @@
 //
-// Copyright 2010 Ettus Research LLC
+// Copyright 2010,2012 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
@@ -28,6 +28,7 @@
 #include <iostream>
 #include <complex>
 #include <ctime>
+#include <cstdlib>
 
 namespace po = boost::program_options;
 
@@ -123,7 +124,7 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){
         std::cout <<
             "This application measures leakage between RX and TX on an XCVR daughterboard to self-calibrate.\n"
             << std::endl;
-        return ~0;
+        return EXIT_FAILURE;
     }
 
     //create a usrp device
@@ -138,6 +139,9 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){
     usrp->set_rx_antenna("CAL");
     usrp->set_tx_antenna("CAL");
 
+    //fail if daughterboard has no serial
+    check_for_empty_serial(usrp, "TX", "tx", args);
+
     //set optimum defaults
     set_optimum_defaults(usrp);
 
@@ -239,5 +243,5 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){
 
     store_results(usrp, results, "TX", "tx", "iq");
 
-    return 0;
+    return EXIT_SUCCESS;
 }