Changeset 44b1674 in mainline for uspace/drv/usbhid/main.c

Timestamp:

2011-04-18T21:48:55Z (14 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

9014dcd

Parents:

618f9ed (diff), 84a04dd (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge form usb/development

File:

• uspace/drv/usbhid/main.c (modified) (2 diffs)

uspace/drv/usbhid/main.c

@@ -75 +75 @@
 static int usb_hid_try_add_device(usb_device_t *dev)
 {
+        assert(dev != NULL);
+        
         /* 
          * Initialize device (get and process descriptors, get address, etc.)
@@ -178 +180 @@
         usb_log_debug("usb_hid_add_device()\n");
         
+        if (dev == NULL) {
+                usb_log_warning("Wrong parameter given for add_device().\n");
+                return EINVAL;
+        }
+        
         if (dev->interface_no < 0) {
                 usb_log_warning("Device is not a supported HID device.\n");