Changeset 065064e6 in mainline for uspace/drv/bus/usb/usbhid/usbhid.c

Timestamp:

2011-10-15T12:49:18Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

e3f7418

Parents:

7c95d6f5

Message:

usb: Add and use usb_device_data_alloc.

Inspired by ddf_dev_data_alloc and ddf_fun_data_alloc.
Fix possible double free (hid dev and hid fun shared driver_data).

File:

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

uspace/drv/bus/usb/usbhid/usbhid.c

@@ -412 +412 @@
 /*----------------------------------------------------------------------------*/
 
-usb_hid_dev_t *usb_hid_new(void)
-{
-        usb_hid_dev_t *hid_dev = (usb_hid_dev_t *)calloc(1,
-            sizeof(usb_hid_dev_t));
+int usb_hid_init(usb_hid_dev_t *hid_dev, usb_device_t *dev)
+{
+        int rc, i;
+
+        usb_log_debug("Initializing HID structure...\n");
 
         if (hid_dev == NULL) {
-                usb_log_error("No memory!\n");
-                return NULL;
+                usb_log_error("Failed to init HID structure: no structure given"
+                    ".\n");
+                return EINVAL;
+        }
+
+        if (dev == NULL) {
+                usb_log_error("Failed to init HID structure: no USB device"
+                    " given.\n");
+                return EINVAL;
         }
 
@@ -426 +434 @@
         if (hid_dev->report == NULL) {
                 usb_log_error("No memory!\n");
-                free(hid_dev);
-                return NULL;
-        }
-
-        hid_dev->poll_pipe_index = -1;
-
-        return hid_dev;
-}
-
-/*----------------------------------------------------------------------------*/
-
-int usb_hid_init(usb_hid_dev_t *hid_dev, usb_device_t *dev)
-{
-        int rc, i;
-
-        usb_log_debug("Initializing HID structure...\n");
-
-        if (hid_dev == NULL) {
-                usb_log_error("Failed to init HID structure: no structure given"
-                    ".\n");
-                return EINVAL;
-        }
-
-        if (dev == NULL) {
-                usb_log_error("Failed to init HID structure: no USB device"
-                    " given.\n");
-                return EINVAL;
-        }
-
+                return ENOMEM;
+        }
         usb_hid_report_init(hid_dev->report);
 
         /* The USB device should already be initialized, save it in structure */
         hid_dev->usb_dev = dev;
+        hid_dev->poll_pipe_index = -1;
 
         rc = usb_hid_check_pipes(hid_dev, dev);