Index: uspace/drv/bus/usb/usbhid/multimedia/multimedia.c
===================================================================
--- uspace/drv/bus/usb/usbhid/multimedia/multimedia.c	(revision 7b54b99895f71a9bb50f961c8539985cfb1abaf7)
+++ uspace/drv/bus/usb/usbhid/multimedia/multimedia.c	(revision 571ba2a6d1096ca345fe99860bda1a01c69480b9)
@@ -64,5 +64,5 @@
 	//int32_t *keys;
 	/** Count of stored keys (i.e. number of keys in the report). */
-	//size_t key_count;	
+	//size_t key_count;
 	/** IPC session to the console device (for sending key events). */
 	async_sess_t *console_sess;
@@ -86,12 +86,12 @@
 {
 	usb_log_debug(NAME " default_connection_handler()\n");
-	
+
 	usb_multimedia_t *multim_dev = (usb_multimedia_t *)fun->driver_data;
-	
+
 	if (multim_dev == NULL) {
 		async_answer_0(icallid, EINVAL);
 		return;
 	}
-	
+
 	async_sess_t *sess =
 	    async_callback_receive_start(EXCHANGE_SERIALIZE, icall);
@@ -137,7 +137,7 @@
 	assert(hid_dev != NULL);
 	assert(multim_dev != NULL);
-	
+
 	kbd_event_t ev;
-	
+
 	ev.type = type;
 	ev.key = key;
@@ -151,5 +151,5 @@
 		return;
 	}
-	
+
 	async_exch_t *exch = async_exchange_begin(multim_dev->console_sess);
 	async_msg_4(exch, KBDEV_EVENT, ev.type, ev.key, ev.mods, ev.c);
@@ -169,20 +169,19 @@
 		return ENOMEM;
 	}
-	
+
 	fun->ops = &multimedia_ops;
 	fun->driver_data = multim_dev;   // TODO: maybe change to hid_dev->data
-	
+
 	int rc = ddf_fun_bind(fun);
 	if (rc != EOK) {
 		usb_log_error("Could not bind DDF function: %s.\n",
 		    str_error(rc));
-		// TODO: Can / should I destroy the DDF function?
 		ddf_fun_destroy(fun);
 		return rc;
 	}
-	
+
 	usb_log_debug("%s function created (handle: %" PRIun ").\n",
 	    NAME, fun->handle);
-	
+
 	rc = ddf_fun_add_to_category(fun, "keyboard");
 	if (rc != EOK) {
@@ -190,9 +189,8 @@
 		    "Could not add DDF function to category 'keyboard': %s.\n",
 		    str_error(rc));
-		// TODO: Can / should I destroy the DDF function?
 		ddf_fun_destroy(fun);
 		return rc;
 	}
-	
+
 	return EOK;
 }
@@ -205,7 +203,7 @@
 		return EINVAL; /*! @todo Other return code? */
 	}
-	
+
 	usb_log_debug(NAME " Initializing HID/multimedia structure...\n");
-	
+
 	usb_multimedia_t *multim_dev = (usb_multimedia_t *)malloc(
 	    sizeof(usb_multimedia_t));
@@ -213,20 +211,20 @@
 		return ENOMEM;
 	}
-	
+
 	multim_dev->console_sess = NULL;
-	
+
 	/*! @todo Autorepeat */
-	
+
 	// save the KBD device structure into the HID device structure
 	*data = multim_dev;
-	
+
 	usb_log_debug(NAME " HID/multimedia device structure initialized.\n");
-	
+
 	int rc = usb_multimedia_create_function(hid_dev, multim_dev);
 	if (rc != EOK)
 		return rc;
-	
+
 	usb_log_debug(NAME " HID/multimedia structure initialized.\n");
-	
+
 	return EOK;
 }
@@ -239,5 +237,5 @@
 		return;
 	}
-	
+
 	if (data != NULL) {
 		usb_multimedia_t *multim_dev = (usb_multimedia_t *)data;
@@ -257,5 +255,5 @@
 
 	usb_multimedia_t *multim_dev = (usb_multimedia_t *)data;
-	
+
 	usb_hid_report_path_t *path = usb_hid_report_path();
 	usb_hid_report_path_append_item(path, USB_HIDUT_PAGE_CONSUMER, 0);
@@ -283,13 +281,13 @@
 			                       key);
 		}
-		
+
 		field = usb_hid_report_get_sibling(
 		    hid_dev->report, field, path, USB_HID_PATH_COMPARE_END
 		    | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY, 
 		    USB_HID_REPORT_TYPE_INPUT);
-	}	
+	}
 
 	usb_hid_report_path_free(path);
-	
+
 	return true;
 }