Changeset 54935cf6 in mainline


Ignore:
Timestamp:
2011-10-03T07:42:08Z (12 years ago)
Author:
Frantisek Princ <frantisek.princ@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
01ab41b
Parents:
00a8f1b (diff), 60c6fe0 (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 mainline

Location:
uspace
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • uspace/drv/bus/usb/usbmast/main.c

    r00a8f1b r54935cf6  
    158158        }
    159159
    160         free(fun_name);
    161 
    162160        /* Allocate soft state */
    163161        mfun = ddf_dev_data_alloc(mdev->ddf_dev, sizeof(usbmast_fun_t));
     
    170168        mfun->mdev = mdev;
    171169        mfun->lun = lun;
    172 
    173         fun_name = NULL;
    174170
    175171        /* Set up a connection handler. */
     
    219215                goto error;
    220216        }
     217
     218        free(fun_name);
    221219
    222220        return EOK;
  • uspace/lib/c/generic/ns.c

    r00a8f1b r54935cf6  
    7575{
    7676        async_exch_t *exch = async_exchange_begin(session_ns);
     77        if (!exch)
     78                return NULL;
    7779        async_sess_t *sess =
    7880            async_connect_me_to_blocking(mgmt, exch, service, arg2, arg3);
    7981        async_exchange_end(exch);
     82
     83        if (!sess)
     84                return NULL;
    8085       
    8186        /*
Note: See TracChangeset for help on using the changeset viewer.