Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset 520acaf in mainline for uspace/srv/hid/input/generic/input.c


Ignore:
Timestamp:
2012-06-06T21:13:29Z (10 years ago)
Author:
Sean Bartell <wingedtachikoma@…>
Branches:
lfn, master
Children:
5f679702
Parents:
11b9ad7 (diff), 3123d2a (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:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/srv/hid/input/generic/input.c

    r11b9ad7 r520acaf  
    662662        async_set_client_connection(client_connection);
    663663        int rc = loc_server_register(NAME);
    664         if (rc < 0) {
    665                 printf("%s: Unable to register server (%d)\n", NAME, rc);
    666                 return -1;
     664        if (rc != EOK) {
     665                printf("%s: Unable to register server\n", NAME);
     666                return rc;
    667667        }
    668668       
     
    671671       
    672672        service_id_t service_id;
    673         if (loc_service_register(kbd, &service_id) != EOK) {
     673        rc = loc_service_register(kbd, &service_id);
     674        if (rc != EOK) {
    674675                printf("%s: Unable to register service %s\n", NAME, kbd);
    675                 return -1;
     676                return rc;
    676677        }
    677678       
Note: See TracChangeset for help on using the changeset viewer.