Index: uspace/drv/usbhub/usbhub.c
===================================================================
--- uspace/drv/usbhub/usbhub.c	(revision 0cfc68f060ff8c44e176a4810205e2255835cb09)
+++ uspace/drv/usbhub/usbhub.c	(revision 3b77628b520eb4eb2108181a33848556e4d06e36)
@@ -26,5 +26,5 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/** @addtogroup usb hub driver
+/** @addtogroup usbhub
  * @{
  */
Index: uspace/drv/usbhub/usblist.c
===================================================================
--- uspace/drv/usbhub/usblist.c	(revision 0cfc68f060ff8c44e176a4810205e2255835cb09)
+++ uspace/drv/usbhub/usblist.c	(revision 3b77628b520eb4eb2108181a33848556e4d06e36)
@@ -26,5 +26,5 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/** @addtogroup usb hub driver
+/** @addtogroup usbhub
  * @{
  */
Index: uspace/drv/usbhub/usblist.h
===================================================================
--- uspace/drv/usbhub/usblist.h	(revision 0cfc68f060ff8c44e176a4810205e2255835cb09)
+++ uspace/drv/usbhub/usblist.h	(revision 3b77628b520eb4eb2108181a33848556e4d06e36)
@@ -27,8 +27,5 @@
  */
 
-
-#ifndef USBLIST_H
-#define	USBLIST_H
-/** @addtogroup usb hub driver
+/** @addtogroup usbhub
  * @{
  */
@@ -40,4 +37,6 @@
  * much simpler and more straight-forward semantics.
  */
+#ifndef USBLIST_H
+#define	USBLIST_H
 
 /**
@@ -78,11 +77,6 @@
 }
 
-
+#endif	/* USBLIST_H */
 /**
  * @}
  */
-
-
-
-#endif	/* USBLIST_H */
-
Index: uspace/drv/usbhub/utils.c
===================================================================
--- uspace/drv/usbhub/utils.c	(revision 0cfc68f060ff8c44e176a4810205e2255835cb09)
+++ uspace/drv/usbhub/utils.c	(revision 3b77628b520eb4eb2108181a33848556e4d06e36)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup libusb usb
+/** @addtogroup usbhub
  * @{
  */
Index: uspace/drv/vhc/devices.c
===================================================================
--- uspace/drv/vhc/devices.c	(revision 0cfc68f060ff8c44e176a4810205e2255835cb09)
+++ uspace/drv/vhc/devices.c	(revision 3b77628b520eb4eb2108181a33848556e4d06e36)
@@ -58,8 +58,7 @@
 /** Create virtual device.
  *
- * @param address USB address.
  * @param phone Callback phone.
  * @return New device.
- * @retval NULL Out of memory or address already occupied.
+ * @retval NULL Out of memory.
  */
 virtdev_connection_t *virtdev_add_device(int phone)
@@ -67,4 +66,8 @@
 	virtdev_connection_t *dev = (virtdev_connection_t *)
 	    malloc(sizeof(virtdev_connection_t));
+	if (dev == NULL) {
+		return NULL;
+	}
+
 	dev->phone = phone;
 	list_append(&dev->link, &devices);