Changeset 54464f6a in mainline for uspace/srv/hid/input/proto/mousedev.c

Timestamp:

2011-11-11T19:48:33Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

50a01a9

Parents:

c2e50d7 (diff), 747ef72 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge mainline changes

File:

• uspace/srv/hid/input/proto/mousedev.c (modified) (6 diffs)

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;
 
@@ -72 +69 @@
 static void mousedev_destroy(mousedev_t *mousedev)
 {
-        if (mousedev->sess != NULL)
-                async_hangup(mousedev->sess);
-        
         free(mousedev);
 }
@@ -89 +83 @@
                 
                 if (!IPC_GET_IMETHOD(call)) {
-                        /* XXX Handle hangup */
+                        mousedev_destroy(mousedev);
                         return;
                 }
@@ -129 +123 @@
                 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);
@@ -139 +132 @@
                     mdev->svc_name);
                 mousedev_destroy(mousedev);
+                async_hangup(sess);
                 return -1;
         }
@@ -144 +138 @@
         int rc = async_connect_to_me(exch, 0, 0, 0, mousedev_callback_conn, mousedev);
         async_exchange_end(exch);
+        async_hangup(sess);
         
         if (rc != EOK) {