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

Changeset d802671d in mainline


Ignore:
Timestamp:
2012-07-01T20:27:01Z (8 years ago)
Author:
Frantisek Princ <frantisek.princ@…>
Branches:
master
Children:
96606fe
Parents:
02020dc (diff), 0bbd13e (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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/drv/bus/isa/isa.c

    r02020dc rd802671d  
    201201
    202202        isa_fun_t *fun = ddf_fun_data_alloc(fnode, sizeof(isa_fun_t));
    203         if (fun == NULL)
     203        if (fun == NULL) {
     204                ddf_fun_destroy(fnode);
    204205                return NULL;
     206        }
    205207
    206208        fibril_mutex_initialize(&fun->mutex);
     
    552554
    553555        isa_fun_t *fun = isa_fun_create(isa, fun_name);
     556        free(fun_name);
    554557        if (fun == NULL) {
    555                 free(fun_name);
    556558                return NULL;
    557559        }
Note: See TracChangeset for help on using the changeset viewer.