Changeset 00aece0 in mainline for uspace/app/mkbd/main.c


Ignore:
Timestamp:
2012-02-18T16:47:38Z (14 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
4449c6c
Parents:
bd5f3b7 (diff), f943dd3 (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/app/mkbd/main.c

    rbd5f3b7 r00aece0  
    4848#include <usb/dev/pipes.h>
    4949#include <async.h>
     50#include <usb/dev.h>
    5051#include <usb/hid/usages/core.h>
    5152#include <usb/hid/hidparser.h>
    … …  
    6970        int rc = usb_hid_report_init(*report);
    7071        if (rc != EOK) {
    71                 usb_hid_free_report(*report);
     72                usb_hid_report_deinit(*report);
    7273                *report = NULL;
    7374                return rc;
    … …  
    7980            &report_desc_size);
    8081        if (rc != EOK) {
    81                 usb_hid_free_report(*report);
     82                usb_hid_report_deinit(*report);
    8283                *report = NULL;
    8384                return rc;
    … …  
    8586       
    8687        if (report_desc_size == 0) {
    87                 usb_hid_free_report(*report);
     88                usb_hid_report_deinit(*report);
    8889                *report = NULL;
    8990                // TODO: other error code?
    … …  
    9394        uint8_t *desc = (uint8_t *) malloc(report_desc_size);
    9495        if (desc == NULL) {
    95                 usb_hid_free_report(*report);
     96                usb_hid_report_deinit(*report);
    9697                *report = NULL;
    9798                return ENOMEM;
    … …  
    103104            &actual_size);
    104105        if (rc != EOK) {
    105                 usb_hid_free_report(*report);
     106                usb_hid_report_deinit(*report);
    106107                *report = NULL;
    107108                free(desc);
    … …  
    110111       
    111112        if (actual_size != report_desc_size) {
    112                 usb_hid_free_report(*report);
     113                usb_hid_report_deinit(*report);
    113114                *report = NULL;
    114115                free(desc);
Note: See TracChangeset for help on using the changeset viewer.