Changes in uspace/srv/hid/input/ctl/kbdev.c [cc574511:cce8a83] in mainline

File:

• uspace/srv/hid/input/ctl/kbdev.c (modified) (5 diffs)

uspace/srv/hid/input/ctl/kbdev.c

@@ -50 +50 @@
 #include <loc.h>
 #include <stdlib.h>
+#include <vfs/vfs_sess.h>
 #include <sys/typefmt.h>
-#include <vfs/vfs_sess.h>
-
 
 static int kbdev_ctl_init(kbd_dev_t *);
@@ -99 +98 @@
         async_exch_t *exch;
         kbdev_t *kbdev;
-        char *svc_name;
         int rc;
 
-        if (asprintf(&svc_name, "devname%" PRIun, kdev->service_id) > 0)
-                svc_name = (char *) "unknown";
-
-        sess = loc_service_connect(EXCHANGE_SERIALIZE, kdev->service_id, 0);
+        sess = loc_service_connect(EXCHANGE_SERIALIZE, kdev->svc_id, 0);
         if (sess == NULL) {
                 printf("%s: Failed starting session with '%s.'\n", NAME,
-                    svc_name);
+                    kdev->svc_name);
                 return -1;
         }
@@ -115 +110 @@
         if (kbdev == NULL) {
                 printf("%s: Failed allocating device structure for '%s'.\n",
-                    NAME, svc_name);
+                    NAME, kdev->svc_name);
                 return -1;
         }
@@ -124 +119 @@
         if (exch == NULL) {
                 printf("%s: Failed starting exchange with '%s'.\n", NAME,
-                    svc_name);
+                    kdev->svc_name);
                 kbdev_destroy(kbdev);
                 return -1;
@@ -132 +127 @@
         if (rc != EOK) {
                 printf("%s: Failed creating callback connection from '%s'.\n",
-                    NAME, svc_name);
+                    NAME, kdev->svc_name);
                 async_exchange_end(exch);
                 kbdev_destroy(kbdev);