Changes in uspace/drv/bus/usb/usbhid/multimedia/multimedia.c [1dc4a5e:5f6e25e] in mainline

File:

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

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

@@ -167 +167 @@
 /*----------------------------------------------------------------------------*/
 
-static void usb_multimedia_free(usb_multimedia_t **multim_dev)
-{
-        if (multim_dev == NULL || *multim_dev == NULL) {
-                return;
-        }
-        
-        // hangup phone to the console
-        async_obsolete_hangup((*multim_dev)->console_phone);
-
-        free(*multim_dev);
-        *multim_dev = NULL;
-}
-
-/*----------------------------------------------------------------------------*/
-
 static int usb_multimedia_create_function(usb_hid_dev_t *hid_dev, 
     usb_multimedia_t *multim_dev)
@@ -247 +232 @@
         
         int rc = usb_multimedia_create_function(hid_dev, multim_dev);
-        if (rc != EOK) {
-                usb_multimedia_free(&multim_dev);
+        if (rc != EOK)
                 return rc;
-        }
         
         usb_log_debug(NAME " HID/multimedia structure initialized.\n");
@@ -267 +250 @@
         if (data != NULL) {
                 usb_multimedia_t *multim_dev = (usb_multimedia_t *)data;
-                usb_multimedia_free(&multim_dev);
+                // hangup phone to the console
+                async_obsolete_hangup(multim_dev->console_phone);
         }
 }