Changeset 4172db4a in mainline

Timestamp:

2018-01-25T02:05:57Z (6 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

e8277c0

Parents:

92a7b296

git-author:

Ondřej Hlavatý <aearsis@…> (2018-01-24 22:51:14)

git-committer:

Ondřej Hlavatý <aearsis@…> (2018-01-25 02:05:57)

Message:

usb: fix some simple errors clang scan found

Location:

uspace

Files:

• drv/block/usbmast/main.c (modified) (1 diff)
• drv/bus/usb/usbmid/main.c (modified) (1 diff)
• lib/usbdev/src/devdrv.c (modified) (1 diff)
• lib/usbhid/src/hidparser.c (modified) (1 diff)

uspace/drv/block/usbmast/main.c

@@ -180 +180 @@
         mdev->luns = calloc(mdev->lun_count, sizeof(ddf_fun_t*));
         if (mdev->luns == NULL) {
-                rc = ENOMEM;
                 usb_log_error("Failed allocating luns table.");
-                goto error;
+                return ENOMEM;
         }
 

uspace/drv/bus/usb/usbmid/main.c

@@ -107 +107 @@
                         usb_log_warning("Failed to turn off child `%s': %s",
                             ddf_fun_get_name(iface->fun), str_error(pret));
-                        ret = pret;
                 }
         }

uspace/lib/usbdev/src/devdrv.c

@@ -555 +555 @@
         if (sess)
                 async_hangup(sess);
-        if (ret != EOK)
+        if (ret != EOK) {
+                free(usb_dev);
                 return NULL;
+        }
 
         const char* dummy = NULL;

uspace/lib/usbhid/src/hidparser.c

@@ -424 +424 @@
 
         if (USB_HID_ITEM_FLAG_CONSTANT(item->item_flags)) {
-                ret = item->logical_minimum;
+                return item->logical_minimum;
         }