Changeset 0c07d70 in mainline


Ignore:
Timestamp:
2011-05-30T15:21:09Z (13 years ago)
Author:
Matus Dekanek <smekideki@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
4708657
Parents:
9843942 (diff), 0dd3e49 (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 usb/development

Location:
uspace/lib/usbhid/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • uspace/lib/usbhid/src/hiddescriptor.c

    r9843942 r0c07d70  
    328328                const usb_hid_report_t *report, uint8_t report_id,
    329329                usb_hid_report_type_t type) {
     330
     331        if(report == NULL) {
     332                return NULL;
     333        }
    330334
    331335        link_t *report_it = report->reports.next;
  • uspace/lib/usbhid/src/hidparser.c

    r9843942 r0c07d70  
    605605       
    606606        if(report_id > 0) {
    607                 report_it = usb_hid_report_find_description(report, report_id,
    608                         type)->link.next;               
     607                report_des = usb_hid_report_find_description(report, report_id,
     608                        type);
     609                if(report_des == NULL) {
     610                        return 0;
     611                }
     612                else {
     613                        report_it = report_des->link.next;
     614                }       
    609615        }
    610616        else {
Note: See TracChangeset for help on using the changeset viewer.