From 48e3ff284f538c470e0bf15cc91b8c3430304bf4 Mon Sep 17 00:00:00 2001 From: Romain Vimont Date: Wed, 26 Jan 2022 21:38:28 +0100 Subject: [PATCH] Make serial mandatory for sc_usb In practice, it is already mandatory. PR #2974 --- app/src/usb/usb.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/app/src/usb/usb.c b/app/src/usb/usb.c index e933fdbc..ebd218dc 100644 --- a/app/src/usb/usb.c +++ b/app/src/usb/usb.c @@ -43,10 +43,6 @@ accept_device(libusb_device *device, const char *serial) { static libusb_device * sc_usb_find_device(const char *serial) { - if (!serial) { - return NULL; - } - libusb_device **list; libusb_device *result = NULL; ssize_t count = libusb_get_device_list(NULL, &list); @@ -81,6 +77,8 @@ sc_usb_open_handle(libusb_device *device) { bool sc_usb_init(struct sc_usb *usb, const char *serial) { + assert(serial); + // There is only one device, initialize the context here if (libusb_init(&usb->context) != LIBUSB_SUCCESS) { return false;