Index: uspace/srv/hid/isdv4_tablet/isdv4.c
===================================================================
--- uspace/srv/hid/isdv4_tablet/isdv4.c	(revision f30052384594e837924dcd017e96ea8752aa676f)
+++ uspace/srv/hid/isdv4_tablet/isdv4.c	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -294,10 +294,10 @@
 }
 
-static int read_packets(isdv4_state_t *state, packet_consumer_fn consumer)
+static errno_t read_packets(isdv4_state_t *state, packet_consumer_fn consumer)
 {
 	bool reading = true;
 	while (reading) {
 		size_t nread;
-		int rc;
+		errno_t rc;
 
 		rc = chardev_read(state->chardev, state->buf + state->buf_end,
@@ -363,5 +363,5 @@
 static bool write_command(chardev_t *chardev, uint8_t command)
 {
-	int rc;
+	errno_t rc;
 	size_t nwr;
 
@@ -370,9 +370,9 @@
 }
 
-int isdv4_init(isdv4_state_t *state, async_sess_t *sess,
+errno_t isdv4_init(isdv4_state_t *state, async_sess_t *sess,
     isdv4_event_fn event_fn)
 {
 	chardev_t *chardev;
-	int rc;
+	errno_t rc;
 
 	rc = chardev_open(sess, &chardev);
@@ -396,5 +396,5 @@
 }
 
-int isdv4_init_tablet(isdv4_state_t *state)
+errno_t isdv4_init_tablet(isdv4_state_t *state)
 {
 	if (!write_command(state->chardev, CMD_STOP))
@@ -407,5 +407,5 @@
 		return EIO;
 
-	int rc = read_packets(state, parse_response_stylus);
+	errno_t rc = read_packets(state, parse_response_stylus);
 	if (rc != EOK)
 		return rc;
@@ -424,5 +424,5 @@
 }
 
-int isdv4_read_events(isdv4_state_t *state)
+errno_t isdv4_read_events(isdv4_state_t *state)
 {
 	return read_packets(state, parse_event);
Index: uspace/srv/hid/isdv4_tablet/isdv4.h
===================================================================
--- uspace/srv/hid/isdv4_tablet/isdv4.h	(revision f30052384594e837924dcd017e96ea8752aa676f)
+++ uspace/srv/hid/isdv4_tablet/isdv4.h	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -90,7 +90,7 @@
 };
 
-extern int isdv4_init(isdv4_state_t *, async_sess_t *, isdv4_event_fn);
-extern int isdv4_init_tablet(isdv4_state_t *);
-extern int isdv4_read_events(isdv4_state_t *state);
+extern errno_t isdv4_init(isdv4_state_t *, async_sess_t *, isdv4_event_fn);
+extern errno_t isdv4_init_tablet(isdv4_state_t *);
+extern errno_t isdv4_read_events(isdv4_state_t *state);
 extern void isdv4_fini(isdv4_state_t *);
 
Index: uspace/srv/hid/isdv4_tablet/main.c
===================================================================
--- uspace/srv/hid/isdv4_tablet/main.c	(revision f30052384594e837924dcd017e96ea8752aa676f)
+++ uspace/srv/hid/isdv4_tablet/main.c	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -50,7 +50,7 @@
 }
 
-static int read_fibril(void *unused)
-{
-	int rc = isdv4_read_events(&state);
+static errno_t read_fibril(void *unused)
+{
+	errno_t rc = isdv4_read_events(&state);
 	if (rc != EOK) {
 		fprintf(stderr, "Failed reading events");
@@ -182,5 +182,5 @@
 
 	int arg = 1;
-	int rc;
+	errno_t rc;
 
 	isdv4_event_fn event_fn = emit_event;