diff options
| author | Martin Braun <martin.braun@ettus.com> | 2015-03-27 14:45:53 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2015-03-27 14:45:53 -0700 |
| commit | 8c20712d611a8ac842984953f9924f30976fe884 (patch) | |
| tree | 526b35d6df14f8d858b5b461886830965f525bec /host/lib | |
| parent | 988c597026551dfcfbb60aaf32d291bb90d0ce93 (diff) | |
| parent | d0a90ff49d9456c2a758f9d49102c8028009a5e4 (diff) | |
| download | uhd-8c20712d611a8ac842984953f9924f30976fe884.tar.gz uhd-8c20712d611a8ac842984953f9924f30976fe884.tar.bz2 uhd-8c20712d611a8ac842984953f9924f30976fe884.zip | |
Merge branch 'maint'
Diffstat (limited to 'host/lib')
| -rw-r--r-- | host/lib/transport/libusb1_base.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/host/lib/transport/libusb1_base.cpp b/host/lib/transport/libusb1_base.cpp index 18acb1fdc..b1045ffa5 100644 --- a/host/lib/transport/libusb1_base.cpp +++ b/host/lib/transport/libusb1_base.cpp @@ -1,5 +1,5 @@ // -// Copyright 2010-2014 Ettus Research LLC +// Copyright 2010-2015 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 @@ -326,7 +326,8 @@ public: } bool firmware_loaded() { - return (get_manufacturer() == "Ettus Research LLC"); + return (get_manufacturer() == "Ettus Research LLC") or + (get_manufacturer() == "Free Software Folks"); } private: |