Changeset 0f09d4ea in mainline


Ignore:
Timestamp:
2011-11-09T07:45:44Z (13 years ago)
Author:
Frantisek Princ <frantisek.princ@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
35f48f2
Parents:
1c1c736 (diff), e9563c3 (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 with mainline

Location:
uspace/srv/hid/input
Files:
2 edited

Legend:

Unmodified
Added
Removed

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

    r1c1c736 r0f09d4ea  
    111111                printf("%s: Failed allocating device structure for '%s'.\n",
    112112                    NAME, kdev->svc_name);
     113                async_hangup(sess);
    113114                return -1;
    114115        }
    … …  
    169170                callid = async_get_call(&call);
    170171                if (!IPC_GET_IMETHOD(call)) {
    171                         /* XXX Handle hangup */
     172                        kbdev_destroy(kbdev);
    172173                        return;
    173174                }

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

    r1c1c736 r0f09d4ea  
    5454        /** Link to generic mouse device */
    5555        mouse_dev_t *mouse_dev;
    56        
    57         /** Session to mouse device */
    58         async_sess_t *sess;
    5956} mousedev_t;
    6057
    … …  
    7269static void mousedev_destroy(mousedev_t *mousedev)
    7370{
    74         if (mousedev->sess != NULL)
    75                 async_hangup(mousedev->sess);
    76        
    7771        free(mousedev);
    7872}
    … …  
    8983               
    9084                if (!IPC_GET_IMETHOD(call)) {
    91                         /* XXX Handle hangup */
     85                        mousedev_destroy(mousedev);
    9286                        return;
    9387                }
    … …  
    129123                printf("%s: Failed allocating device structure for '%s'.\n",
    130124                    NAME, mdev->svc_name);
     125                async_hangup(sess);
    131126                return -1;
    132127        }
    133        
    134         mousedev->sess = sess;
    135128       
    136129        async_exch_t *exch = async_exchange_begin(sess);
    … …  
    139132                    mdev->svc_name);
    140133                mousedev_destroy(mousedev);
     134                async_hangup(sess);
    141135                return -1;
    142136        }
    … …  
    144138        int rc = async_connect_to_me(exch, 0, 0, 0, mousedev_callback_conn, mousedev);
    145139        async_exchange_end(exch);
     140        async_hangup(sess);
    146141       
    147142        if (rc != EOK) {
Note: See TracChangeset for help on using the changeset viewer.