diff options
| author | Ashish Chaudhari <ashish@ettus.com> | 2016-02-18 17:40:47 -0800 |
|---|---|---|
| committer | Ashish Chaudhari <ashish@ettus.com> | 2016-02-18 17:40:47 -0800 |
| commit | 1c2f56bbc1ccd0bffaac8fa4da174d1ad130a3ba (patch) | |
| tree | a6c4fb7f587a6949485717d13cea3e4fa53e3496 /host/lib/transport/libusb1_zero_copy.cpp | |
| parent | 2d68f228888807d0fd76c7b759ec39fd86523f67 (diff) | |
| parent | ed4223d74cab604213b925da2eccb6055aa7aea2 (diff) | |
| download | uhd-1c2f56bbc1ccd0bffaac8fa4da174d1ad130a3ba.tar.gz uhd-1c2f56bbc1ccd0bffaac8fa4da174d1ad130a3ba.tar.bz2 uhd-1c2f56bbc1ccd0bffaac8fa4da174d1ad130a3ba.zip | |
Merge branch 'maint'
Conflicts:
host/lib/usrp/cores/gpio_core_200.cpp
host/lib/usrp/dboard/db_ubx.cpp
Diffstat (limited to 'host/lib/transport/libusb1_zero_copy.cpp')
| -rw-r--r-- | host/lib/transport/libusb1_zero_copy.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/host/lib/transport/libusb1_zero_copy.cpp b/host/lib/transport/libusb1_zero_copy.cpp index b67b36d0a..53e345009 100644 --- a/host/lib/transport/libusb1_zero_copy.cpp +++ b/host/lib/transport/libusb1_zero_copy.cpp @@ -149,8 +149,8 @@ public: if (wait_for_completion(timeout)) { if (result.status != LIBUSB_TRANSFER_COMPLETED) - throw uhd::runtime_error(str(boost::format("usb %s transfer status: %d") - % _name % libusb_error_name(result.status))); + throw uhd::io_error(str(boost::format("usb %s transfer status: %d") + % _name % libusb_error_name(result.status))); result.completed = 0; return make(reinterpret_cast<buffer_type *>(this), _lut->buffer, (_is_recv)? result.actual_length : _frame_size); } |