Changeset 13b07dd in mainline for uspace/srv/devman/drv_conn.c


Ignore:
Timestamp:
2015-03-22T23:29:56Z (9 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
ba0eac5
Parents:
4a5ae542 (diff), acb8766e (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 from lp:~werkov/helenos/various-fixes

  • devman_drv_fun_online() was accidentally offlining instead of onlining
File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/srv/devman/drv_conn.c

    r4a5ae542 r13b07dd  
    173173        callid = async_get_call(&call);
    174174        if (DEVMAN_ADD_MATCH_ID != IPC_GET_IMETHOD(call)) {
    175                 log_msg(LOG_DEFAULT, LVL_ERROR, 
     175                log_msg(LOG_DEFAULT, LVL_ERROR,
    176176                    "Invalid protocol when trying to receive match id.");
    177                 async_answer_0(callid, EINVAL); 
     177                async_answer_0(callid, EINVAL);
    178178                delete_match_id(match_id);
    179179                return EINVAL;
     
    246246        if (ftype != fun_inner && ftype != fun_exposed) {
    247247                /* Unknown function type */
    248                 log_msg(LOG_DEFAULT, LVL_ERROR, 
     248                log_msg(LOG_DEFAULT, LVL_ERROR,
    249249                    "Unknown function type %d provided by driver.",
    250250                    (int) ftype);
     
    404404        fibril_rwlock_read_unlock(&device_tree.rwlock);
    405405       
    406         rc = fun_offline(fun);
     406        rc = fun_online(fun);
    407407        if (rc != EOK) {
    408408                fun_busy_unlock(fun);
Note: See TracChangeset for help on using the changeset viewer.