Changeset b4ca0a9c in mainline for uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart.c

Timestamp:

2012-07-10T11:53:50Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

1e01a35

Parents:

a33706e (diff), 33fc3ae (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:

• uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart.c (modified) (1 diff)

uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart.c

@@ -77 +77 @@
 int main(int argc, char *argv[])
 {
-        int rc;
-
-        printf(NAME ": S3C24xx on-chip UART driver\n");
-
+        printf("%s: S3C24xx on-chip UART driver\n", NAME);
+        
         async_set_client_connection(s3c24xx_uart_connection);
-        rc = loc_server_register(NAME);
-        if (rc < 0) {
-                printf(NAME ": Unable to register server.\n");
-                return -1;
+        int rc = loc_server_register(NAME);
+        if (rc != EOK) {
+                printf("%s: Unable to register server.\n", NAME);
+                return rc;
         }