From 5e9c0b862aa6e74ee6db6368b2dedcb7857dd99b Mon Sep 17 00:00:00 2001

From: Elizaveta Morozova <morozovaes@altlinux.org>

Date: Wed, 1 Mar 2023 12:28:43 +0300

Subject: [PATCH] nut-2.8.0-alt-usb

---

 drivers/libusb0.c    | 5 ++++-

 drivers/libusb1.c    | 5 ++++-

 drivers/usbhid-ups.c | 2 ++

 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/drivers/libusb0.c b/drivers/libusb0.c

index 4fd12c7bd..5f960984f 100644

--- a/drivers/libusb0.c

+++ b/drivers/libusb0.c

@@ -437,7 +437,10 @@ static int libusb_open(usb_dev_handle **udevp,

 #endif

 			/* if_claimed = 1; */

-			nut_usb_set_altinterface(udev);

+			if (nut_usb_set_altinterface(udev) != 0) {

+				upsdebugx(2, " Couldn't set default interface");

+				goto next_device;

+			}

 			if (!callback) {

 				return 1;

diff --git a/drivers/libusb1.c b/drivers/libusb1.c

index 584d51852..51252c709 100644

--- a/drivers/libusb1.c

+++ b/drivers/libusb1.c

@@ -484,7 +484,10 @@ static int nut_libusb_open(libusb_device_handle **udevp,

 		upsdebugx(2, "Claimed interface %d successfully",

 			usb_subdriver.hid_rep_index);

-		nut_usb_set_altinterface(udev);

+		if (nut_usb_set_altinterface(udev) != 0) {

+				upsdebugx(2, " Couldn't set default interface");

+				goto next_device;

+			}

 		if (!callback) {

 			libusb_free_config_descriptor(conf_desc);

-- 

2.33.5