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

Timestamp:

2023-10-22T17:55:33Z (14 months ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

ticket/834-toolchain-update

Children:

350ec74

Parents:

315d487 (diff), 133461c (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 branch 'master' into ticket

File:

• uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart.c (modified) (3 diffs)

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

@@ -1 +1 @@
 /*
- * Copyright (c) 2010 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * All rights reserved.
  *
@@ -80 +80 @@
 int main(int argc, char *argv[])
 {
+        loc_srv_t *srv;
+
         printf("%s: S3C24xx on-chip UART driver\n", NAME);
 
         async_set_fallback_port_handler(s3c24xx_uart_connection, uart);
-        errno_t rc = loc_server_register(NAME);
+        errno_t rc = loc_server_register(NAME, &srv);
         if (rc != EOK) {
                 printf("%s: Unable to register server.\n", NAME);
@@ -90 +92 @@
 
         uart = malloc(sizeof(s3c24xx_uart_t));
-        if (uart == NULL)
-                return -1;
-
-        if (s3c24xx_uart_init(uart) != EOK)
-                return -1;
-
-        rc = loc_service_register(NAMESPACE "/" NAME, &uart->service_id);
+        if (uart == NULL) {
+                loc_server_unregister(srv);
+                return -1;
+        }
+
+        if (s3c24xx_uart_init(uart) != EOK) {
+                free(uart);
+                loc_server_unregister(srv);
+                return -1;
+        }
+
+        rc = loc_service_register(srv, NAMESPACE "/" NAME, &uart->service_id);
         if (rc != EOK) {
+                // XXX s3c24xx_uart_fini(uart);
+                free(uart);
+                loc_server_unregister(srv);
                 printf(NAME ": Unable to register device %s.\n",
                     NAMESPACE "/" NAME);