Index: uspace/srv/hid/input/input.c
===================================================================
--- uspace/srv/hid/input/input.c	(revision d5c1051faf4391647834d99babdd4a44ee5d9700)
+++ uspace/srv/hid/input/input.c	(revision 09d13c8e567316acfec91989df4a5d961f8fb644)
@@ -473,5 +473,5 @@
 	kdev->ctl_ops = &kbdev_ctl;
 	
-	int rc = loc_service_get_name(service_id, &kdev->svc_name);
+	errno_t rc = loc_service_get_name(service_id, &kdev->svc_name);
 	if (rc != EOK) {
 		kdev->svc_name = NULL;
@@ -510,5 +510,5 @@
 	mdev->proto_ops = &mousedev_proto;
 	
-	int rc = loc_service_get_name(service_id, &mdev->svc_name);
+	errno_t rc = loc_service_get_name(service_id, &mdev->svc_name);
 	if (rc != EOK) {
 		mdev->svc_name = NULL;
@@ -530,5 +530,5 @@
 }
 
-static int serial_consumer(void *arg)
+static errno_t serial_consumer(void *arg)
 {
 	serial_dev_t *sdev = (serial_dev_t *) arg;
@@ -554,5 +554,5 @@
 {
 	bool match = false;
-	int rc;
+	errno_t rc;
 
 	serial_dev_t *sdev = serial_dev_new();
@@ -633,5 +633,5 @@
 }
 
-static int dev_check_new_kbdevs(void)
+static errno_t dev_check_new_kbdevs(void)
 {
 	category_id_t keyboard_cat;
@@ -639,5 +639,5 @@
 	size_t count, i;
 	bool already_known;
-	int rc;
+	errno_t rc;
 	
 	rc = loc_category_get_id("keyboard", &keyboard_cat, IPC_FLAG_BLOCKING);
@@ -684,5 +684,5 @@
 }
 
-static int dev_check_new_mousedevs(void)
+static errno_t dev_check_new_mousedevs(void)
 {
 	category_id_t mouse_cat;
@@ -690,5 +690,5 @@
 	size_t count, i;
 	bool already_known;
-	int rc;
+	errno_t rc;
 	
 	rc = loc_category_get_id("mouse", &mouse_cat, IPC_FLAG_BLOCKING);
@@ -735,5 +735,5 @@
 }
 
-static int dev_check_new_serialdevs(void)
+static errno_t dev_check_new_serialdevs(void)
 {
 	category_id_t serial_cat;
@@ -741,5 +741,5 @@
 	size_t count, i;
 	bool already_known;
-	int rc;
+	errno_t rc;
 	
 	rc = loc_category_get_id("serial", &serial_cat, IPC_FLAG_BLOCKING);
@@ -786,7 +786,7 @@
 }
 
-static int dev_check_new(void)
-{
-	int rc;
+static errno_t dev_check_new(void)
+{
+	errno_t rc;
 	
 	fibril_mutex_lock(&discovery_lock);
@@ -823,7 +823,7 @@
 
 /** Start listening for new devices. */
-static int input_start_dev_discovery(void)
-{
-	int rc = loc_register_cat_change_cb(cat_change_cb);
+static errno_t input_start_dev_discovery(void)
+{
+	errno_t rc = loc_register_cat_change_cb(cat_change_cb);
 	if (rc != EOK) {
 		printf("%s: Failed registering callback for device discovery: "
@@ -842,5 +842,5 @@
 int main(int argc, char **argv)
 {
-	int rc;
+	errno_t rc;
 
 	if (argc < 2) {