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

Timestamp:

2013-07-15T12:14:55Z (12 years ago)

Author:

Manuele Conti <conti.ma@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

c84146d3

Parents:

87159eb8 (diff), 956d4281 (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 changes.

File:

• uspace/drv/char/ns8250/ns8250.c (modified) (2 diffs)

uspace/drv/char/ns8250/ns8250.c

@@ -236 +236 @@
  *
  * @param fun           The serial port function
- * @param buf           The ouput buffer for read data.
+ * @param buf           The output buffer for read data.
  * @param count         The number of bytes to be read.
  *
@@ -918 +918 @@
         
         fibril_mutex_lock(&ns->mutex);
-                if (ns->client_connections > 0) {
+        if (ns->client_connections > 0) {
                 fibril_mutex_unlock(&ns->mutex);
                 return EBUSY;