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

File:

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

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

@@ -54 +54 @@
 
 // FIXME: remove this header
-#include <abi/ipc/methods.h>
+#include <kernel/ipc/ipc_methods.h>
 
 #define NAME "multimedia-keys"
@@ -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)
 {
-        /* Create the exposed function. */
+        /* Create the function exposed under /dev/devices. */
         ddf_fun_t *fun = ddf_fun_create(hid_dev->usb_dev->ddf_dev, fun_exposed, 
             NAME);
@@ -190 +205 @@
         }
         
-        usb_log_debug("%s function created (handle: %" PRIun ").\n",
+        usb_log_debug("%s function created (jandle: %" PRIun ").\n",
             NAME, fun->handle);
         
-        rc = ddf_fun_add_to_category(fun, "keyboard");
+        rc = ddf_fun_add_to_class(fun, "keyboard");
         if (rc != EOK) {
                 usb_log_error(
-                    "Could not add DDF function to category 'keyboard': %s.\n",
+                    "Could not add DDF function to class 'keyboard': %s.\n",
                     str_error(rc));
                 // TODO: Can / should I destroy the DDF function?
@@ -232 +247 @@
         
         int rc = usb_multimedia_create_function(hid_dev, multim_dev);
-        if (rc != EOK)
+        if (rc != EOK) {
+                usb_multimedia_free(&multim_dev);
                 return rc;
+        }
         
         usb_log_debug(NAME " HID/multimedia structure initialized.\n");
@@ -250 +267 @@
         if (data != NULL) {
                 usb_multimedia_t *multim_dev = (usb_multimedia_t *)data;
-                // hangup phone to the console
-                async_obsolete_hangup(multim_dev->console_phone);
+                usb_multimedia_free(&multim_dev);
         }
 }