Index: uspace/app/vuhid/device.c
===================================================================
--- uspace/app/vuhid/device.c	(revision 50340bf5c86773ddf0fa81acd13f156e6d0374cb)
+++ uspace/app/vuhid/device.c	(revision e6503e92165017ece3356ab4fcc7b98fedc71c10)
@@ -96,13 +96,15 @@
     const char *id)
 {
-	vuhid_interface_t *iface = ifaces[0];
-	while (iface != NULL) {
-		if (str_cmp(iface->id, id) == 0) {
-			return iface;
+	if ((ifaces == NULL) || (id == NULL)) {
+		return NULL;
+	}
+	while (*ifaces != NULL) {
+		if (str_cmp((*ifaces)->id, id) == 0) {
+			return *ifaces;
 		}
-		iface++;
-	}
-
-	return iface;
+		ifaces++;
+	}
+
+	return NULL;
 }
 
@@ -119,6 +121,4 @@
 	}
 
-	// FIXME - we shall set vuhid_data to NULL in the main() rather
-	// than to depend on individual interfaces
 	/* Already used interface. */
 	if (iface->vuhid_data != NULL) {
@@ -166,5 +166,4 @@
 	 * Prepare new descriptors.
 	 */
-	printf("preparing descriptors...\n");
 	size_t descr_count = 0;
 	size_t total_descr_size = 0;
@@ -273,5 +272,4 @@
 	}
 
-	printf("adding extra descriptors...\n");
 	/* Allocation is okay, we can (actually have to now) overwrite the
 	 * original pointer.