Changeset dc5c303 in mainline for uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c

Timestamp:

2023-12-28T13:59:23Z (22 months ago)

Author:

GitHub <noreply@…>

Children:

6b66de6b

Parents:

42c2e65 (diff), f87ff8e (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.

git-author:

boba-buba <120932204+boba-buba@…> (2023-12-28 13:59:23)

git-committer:

GitHub <noreply@…> (2023-12-28 13:59:23)

Message:

Merge branch 'master' into topic/packet-capture

File:

• uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c (modified) (4 diffs)

uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2010 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * All rights reserved.
  *
@@ -39 +39 @@
 #include <ddi.h>
 #include <loc.h>
-#include <io/console.h>
 #include <vfs/vfs.h>
 #include <ipc/mouseev.h>
@@ -81 +80 @@
 int main(int argc, char *argv[])
 {
+        loc_srv_t *srv;
+
         printf("%s: S3C24xx touchscreen driver\n", NAME);
 
         async_set_fallback_port_handler(s3c24xx_ts_connection, NULL);
-        errno_t rc = loc_server_register(NAME);
+        errno_t rc = loc_server_register(NAME, &srv);
         if (rc != EOK) {
                 printf("%s: Unable to register driver.\n", NAME);
@@ -91 +92 @@
 
         ts = malloc(sizeof(s3c24xx_ts_t));
-        if (ts == NULL)
+        if (ts == NULL) {
+                loc_server_unregister(srv);
                 return -1;
-
-        if (s3c24xx_ts_init(ts) != EOK)
+        }
+
+        if (s3c24xx_ts_init(ts) != EOK) {
+                free(ts);
+                loc_server_unregister(srv);
                 return -1;
-
-        rc = loc_service_register(NAMESPACE "/mouse", &ts->service_id);
+        }
+
+        rc = loc_service_register(srv, NAMESPACE "/mouse", &ts->service_id);
         if (rc != EOK) {
+                // XXX s3c24xx_ts_fini();
+                free(ts);
+                loc_server_unregister(srv);
                 printf(NAME ": Unable to register device %s.\n",
                     NAMESPACE "/mouse");