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

Timestamp:

2011-10-15T12:49:18Z (14 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/usbmid/explore.c (modified) (4 diffs)

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

@@ -163 +163 @@
         }
 
-        usb_mid_t *usb_mid = malloc(sizeof(usb_mid_t));
+        usb_mid_t *usb_mid = usb_device_data_alloc(dev, sizeof(usb_mid_t));
         if (!usb_mid) {
                 usb_log_error("Failed to create USB MID structure.\n");
@@ -173 +173 @@
         if (usb_mid->ctl_fun == NULL) {
                 usb_log_error("Failed to create control function.\n");
-                free(usb_mid);
                 return false;
         }
@@ -184 +183 @@
                     str_error(rc));
                 ddf_fun_destroy(usb_mid->ctl_fun);
-                free(usb_mid);
                 return false;
         }
@@ -209 +207 @@
                 }
         }
-        dev->driver_data = usb_mid;
 
         return true;