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

Changeset 6c69d19 in mainline for uspace/drv/bus/usb/uhci/root_hub.c


Ignore:
Timestamp:
2011-07-25T20:34:17Z (11 years ago)
Author:
Jiří Zárevúcky <zarevucky.jiri@…>
Branches:
lfn, master
Children:
00c2de63, c936c7f
Parents:
5889fc74 (diff), d542aad (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 libposix.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/drv/bus/usb/uhci/root_hub.c

    r5889fc74 r6c69d19  
    5050int rh_init(rh_t *instance, ddf_fun_t *fun, uintptr_t reg_addr, size_t reg_size)
    5151{
     52        int ret;
     53
    5254        assert(fun);
    5355
    54         char *match_str = NULL;
    55         int ret = asprintf(&match_str, "usb&uhci&root-hub");
    56         if (ret < 0) {
    57                 usb_log_error(
    58                     "Failed(%d) to create root hub match string: %s.\n",
    59                     ret, str_error(ret));
    60                 return ret;
    61         }
    62         assert(match_str);
    63 
    64         ret = ddf_fun_add_match_id(fun, match_str, 100);
     56        ret = ddf_fun_add_match_id(fun, "usb&uhci&root-hub", 100);
    6557        if (ret != EOK) {
    66                 free(match_str);
    67                 usb_log_error("Failed(%d) to add root hub match id: %s\n",
    68                     ret, str_error(ret));
     58                usb_log_error("Failed to add root hub match id: %s\n",
     59                    str_error(ret));
    6960                return ret;
    7061        }
Note: See TracChangeset for help on using the changeset viewer.