Changes in uspace/drv/usbhid/usbhid.c [aaf6155:1cbb4b7] in mainline

File:

• uspace/drv/usbhid/usbhid.c (modified) (5 diffs)

uspace/drv/usbhid/usbhid.c

@@ -360 +360 @@
         rc = usb_hid_check_pipes(hid_dev, dev);
         if (rc != EOK) {
-                //usb_hid_free(&hid_dev);
+                usb_hid_free(&hid_dev);
                 return rc;
         }
@@ -368 +368 @@
         if (rc != EOK) {
                 usb_log_error("Failed to initialize report parser.\n");
-                //usb_hid_free(&hid_dev);
+                usb_hid_free(&hid_dev);
                 return rc;
         }
@@ -386 +386 @@
                             " device.\n");
                         fallback = true;
-                        assert(hid_dev->subdrivers == NULL);
-                        assert(hid_dev->subdriver_count == 0);
                 }
         } else {
@@ -428 +426 @@
                 usb_log_error("No subdriver for handling this device could be"
                     " initialized: %s.\n", str_error(rc));
-                usb_log_debug("Subdriver count: %d\n", 
-                    hid_dev->subdriver_count);
-                //usb_hid_free(&hid_dev);
+                usb_hid_free(&hid_dev);
         } else {
                 bool ok = false;
@@ -554 +550 @@
         }
         
-        usb_log_debug("Subdrivers: %p, subdriver count: %d\n", 
-            (*hid_dev)->subdrivers, (*hid_dev)->subdriver_count);
-        
         assert((*hid_dev)->subdrivers != NULL 
             || (*hid_dev)->subdriver_count == 0);