diff options
| author | Nick Sanders <nsanders@chromium.org> | 2018-07-02 18:44:50 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2018-07-06 18:48:32 -0700 |
| commit | 7d26ae49bffcf269df82df7d0fee00e8c3341166 (patch) | |
| tree | 31bc6a099279595fd0b3d90943a91233cbc85b38 /extra/usb_updater/fw_update.py | |
| parent | 66b400fa25992943f1278426b54f3109fb033407 (diff) | |
| download | chrome-ec-7d26ae49bffcf269df82df7d0fee00e8c3341166.tar.gz | |
ec-devutils: update pyusb to 1.0.2
Pyusb interface has changed yet again. Patch calls to get_string
and usb.core.find. Modify ordering of detetch kernel driver
and avoid rereferencing endpoints.
BRANCH=None
BUG=b:110907544
TEST=emerge ec-devutils, run powerlog, usb_console, servo_updater
CQ-DEPEND=CL:1119632
Signed-off-by: Nick Sanders <nsanders@chromium.org>
Change-Id: I33df474ce3bb57d2e11c9f384ac013b51d210843
Reviewed-on: https://chromium-review.googlesource.com/1125354
Commit-Ready: Nick Sanders <nsanders@chromium.org>
Tested-by: Nick Sanders <nsanders@chromium.org>
Reviewed-by: Aseda Aboagye <aaboagye@chromium.org>
Diffstat (limited to 'extra/usb_updater/fw_update.py')
| -rwxr-xr-x | extra/usb_updater/fw_update.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/extra/usb_updater/fw_update.py b/extra/usb_updater/fw_update.py index 367c0cad14..8a73070ccf 100755 --- a/extra/usb_updater/fw_update.py +++ b/extra/usb_updater/fw_update.py @@ -67,7 +67,8 @@ class Supdate(object): vendor = self._brdcfg['vid'] product = self._brdcfg['pid'] - dev_list = usb.core.find(idVendor=vendor, idProduct=product, find_all=True) + dev_g = usb.core.find(idVendor=vendor, idProduct=product, find_all=True) + dev_list = list(dev_g) if dev_list is None: raise Exception("Update", "USB device not found") @@ -75,7 +76,7 @@ class Supdate(object): dev = None if serialname: for d in dev_list: - if usb.util.get_string(d, 256, d.iSerialNumber) == serialname: + if usb.util.get_string(d, d.iSerialNumber) == serialname: dev = d break if dev is None: |