Changes in / [0f09d4ea:1c1c736] in mainline

Location:

uspace/srv/hid/input

Files:

• ctl/kbdev.c (modified) (2 diffs)
• proto/mousedev.c (modified) (6 diffs)

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

@@ -111 +111 @@
                 printf("%s: Failed allocating device structure for '%s'.\n",
                     NAME, kdev->svc_name);
-                async_hangup(sess);
                 return -1;
         }
@@ -170 +169 @@
                 callid = async_get_call(&call);
                 if (!IPC_GET_IMETHOD(call)) {
-                        kbdev_destroy(kbdev);
+                        /* XXX Handle hangup */
                         return;
                 }

uspace/srv/hid/input/proto/mousedev.c

@@ -54 +54 @@
         /** Link to generic mouse device */
         mouse_dev_t *mouse_dev;
+        
+        /** Session to mouse device */
+        async_sess_t *sess;
 } mousedev_t;
 
@@ -69 +72 @@
 static void mousedev_destroy(mousedev_t *mousedev)
 {
+        if (mousedev->sess != NULL)
+                async_hangup(mousedev->sess);
+        
         free(mousedev);
 }
@@ -83 +89 @@
                 
                 if (!IPC_GET_IMETHOD(call)) {
-                        mousedev_destroy(mousedev);
+                        /* XXX Handle hangup */
                         return;
                 }
@@ -123 +129 @@
                 printf("%s: Failed allocating device structure for '%s'.\n",
                     NAME, mdev->svc_name);
-                async_hangup(sess);
                 return -1;
         }
+        
+        mousedev->sess = sess;
         
         async_exch_t *exch = async_exchange_begin(sess);
@@ -132 +139 @@
                     mdev->svc_name);
                 mousedev_destroy(mousedev);
-                async_hangup(sess);
                 return -1;
         }
@@ -138 +144 @@
         int rc = async_connect_to_me(exch, 0, 0, 0, mousedev_callback_conn, mousedev);
         async_exchange_end(exch);
-        async_hangup(sess);
         
         if (rc != EOK) {