Index: uspace/srv/hid/input/ctl/kbdev.c
===================================================================
--- uspace/srv/hid/input/ctl/kbdev.c	(revision e9563c356932b782a1f6979ffab3a58b0bc12f9f)
+++ uspace/srv/hid/input/ctl/kbdev.c	(revision 804d9b62fe9ebfd0dbe04bdf00f0bd0114431bfe)
@@ -68,5 +68,5 @@
 	/** Link to generic keyboard device */
 	kbd_dev_t *kbd_dev;
-
+	
 	/** Session with kbdev device */
 	async_sess_t *sess;
@@ -75,10 +75,8 @@
 static kbdev_t *kbdev_new(kbd_dev_t *kdev)
 {
-	kbdev_t *kbdev;
-
-	kbdev = calloc(1, sizeof(kbdev_t));
+	kbdev_t *kbdev = calloc(1, sizeof(kbdev_t));
 	if (kbdev == NULL)
 		return NULL;
-
+	
 	kbdev->kbd_dev = kdev;
 
@@ -90,4 +88,5 @@
 	if (kbdev->sess != NULL)
 		async_hangup(kbdev->sess);
+	
 	free(kbdev);
 }
@@ -95,35 +94,31 @@
 static int kbdev_ctl_init(kbd_dev_t *kdev)
 {
-	async_sess_t *sess;
-	async_exch_t *exch;
-	kbdev_t *kbdev;
-	int rc;
-
-	sess = loc_service_connect(EXCHANGE_SERIALIZE, kdev->svc_id, 0);
+	async_sess_t *sess = loc_service_connect(EXCHANGE_SERIALIZE,
+	    kdev->svc_id, 0);
 	if (sess == NULL) {
 		printf("%s: Failed starting session with '%s.'\n", NAME,
 		    kdev->svc_name);
-		return -1;
+		return ENOENT;
 	}
-
-	kbdev = kbdev_new(kdev);
+	
+	kbdev_t *kbdev = kbdev_new(kdev);
 	if (kbdev == NULL) {
 		printf("%s: Failed allocating device structure for '%s'.\n",
 		    NAME, kdev->svc_name);
 		async_hangup(sess);
-		return -1;
+		return ENOMEM;
 	}
-
+	
 	kbdev->sess = sess;
-
-	exch = async_exchange_begin(sess);
+	
+	async_exch_t *exch = async_exchange_begin(sess);
 	if (exch == NULL) {
 		printf("%s: Failed starting exchange with '%s'.\n", NAME,
 		    kdev->svc_name);
 		kbdev_destroy(kbdev);
-		return -1;
+		return ENOENT;
 	}
-
-	rc = async_connect_to_me(exch, 0, 0, 0, kbdev_callback_conn, kbdev);
+	
+	int rc = async_connect_to_me(exch, 0, 0, 0, kbdev_callback_conn, kbdev);
 	if (rc != EOK) {
 		printf("%s: Failed creating callback connection from '%s'.\n",
@@ -131,9 +126,9 @@
 		async_exchange_end(exch);
 		kbdev_destroy(kbdev);
-		return -1;
+		return rc;
 	}
-
+	
 	async_exchange_end(exch);
-
+	
 	kdev->ctl_private = (void *) kbdev;
 	return 0;
@@ -142,13 +137,9 @@
 static void kbdev_ctl_set_ind(kbd_dev_t *kdev, unsigned mods)
 {
-	async_sess_t *sess;
-	async_exch_t *exch;
-
-	sess = ((kbdev_t *) kdev->ctl_private)->sess;
-
-	exch = async_exchange_begin(sess);
+	async_sess_t *sess = ((kbdev_t *) kdev->ctl_private)->sess;
+	async_exch_t *exch = async_exchange_begin(sess);
 	if (!exch)
 		return;
-
+	
 	async_msg_1(exch, KBDEV_SET_IND, mods);
 	async_exchange_end(exch);