Changeset bdae198 in mainline for uspace/drv/char/ns8250/ns8250.c


Ignore:
Timestamp:
2013-08-04T12:01:10Z (13 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
ea509069
Parents:
b08879c2 (diff), d856110 (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 mainline changes

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/drv/char/ns8250/ns8250.c

    rb08879c2 rbdae198  
    236236 *
    237237 * @param fun           The serial port function
    238  * @param buf           The ouput buffer for read data.
     238 * @param buf           The output buffer for read data.
    239239 * @param count         The number of bytes to be read.
    240240 *
     
    918918       
    919919        fibril_mutex_lock(&ns->mutex);
    920                 if (ns->client_connections > 0) {
     920        if (ns->client_connections > 0) {
    921921                fibril_mutex_unlock(&ns->mutex);
    922922                return EBUSY;
Note: See TracChangeset for help on using the changeset viewer.