Changeset 4b44de57 in mainline

Timestamp:

2012-04-01T20:19:01Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

28ca043f

Parents:

0883de8

Message:

RTC: invoke the cleanup function in case of errors

File:

• uspace/drv/time/cmos-rtc/cmos-rtc.c (modified) (11 diffs)

uspace/drv/time/cmos-rtc/cmos-rtc.c

@@ -79 +79 @@
 rtc_pio_enable(rtc_t *rtc);
 
+static void
+rtc_dev_cleanup(rtc_t *rtc);
+
 
 static ddf_dev_ops_t rtc_dev_ops;
@@ -113 +116 @@
 }
 
+/** Clean up the RTC soft state
+ *
+ * @param rtc  The RTC device
+ */
+static void
+rtc_dev_cleanup(rtc_t *rtc)
+{
+        if (rtc->dev->parent_sess) {
+                async_hangup(rtc->dev->parent_sess);
+                rtc->dev->parent_sess = NULL;
+        }
+}
+
 /** Enable the I/O ports of the device
  *
@@ -142 +158 @@
 rtc_dev_initialize(rtc_t *rtc)
 {
-        /* XXX Do cleanup in case of failure */
         int rc;
         size_t i;
@@ -160 +175 @@
                 ddf_msg(LVL_ERROR, "Failed to connect to parent driver\
                     of device %s.", rtc->dev->name);
-                return ENOENT;
+                rc = ENOENT;
+                goto error;
         }
 
@@ -168 +184 @@
                 ddf_msg(LVL_ERROR, "Failed to get HW resources\
                     for device %s", rtc->dev->name);
-                return rc;
+                goto error;
         }
 
@@ -186 +202 @@
                 ddf_msg(LVL_ERROR, "Missing HW resource for device %s",
                     rtc->dev->name);
-                return ENOENT;
+                rc = ENOENT;
+                goto error;
         }
 
@@ -192 +209 @@
 
         return EOK;
+
+error:
+        rtc_dev_cleanup(rtc);
+        hw_res_clean_resource_list(&hw_resources);
+
+        return rc;
 }
 
@@ -230 +253 @@
 {
         rtc_t *rtc;
-        ddf_fun_t *fun;
+        ddf_fun_t *fun = NULL;
         int rc;
+        bool need_cleanup = false;
 
         ddf_msg(LVL_DEBUG, "rtc_dev_add %s (handle = %d)",
@@ -245 +269 @@
         rc = rtc_dev_initialize(rtc);
         if (rc != EOK)
-                return rc;
-
-        /* XXX Need cleanup */
-        if (!rtc_pio_enable(rtc))
-                return EADDRNOTAVAIL;
+                goto error;
+
+        need_cleanup = true;
+
+        if (!rtc_pio_enable(rtc)) {
+                rc = EADDRNOTAVAIL;
+                goto error;
+        }
 
         fun = ddf_fun_create(dev, fun_exposed, "a");
         if (!fun) {
                 ddf_msg(LVL_ERROR, "Failed creating function");
-                return ENOENT;
+                rc = ENOENT;
+                goto error;
         }
 
@@ -261 +289 @@
         if (rc != EOK) {
                 ddf_msg(LVL_ERROR, "Failed binding function");
-                return rc;
+                goto error;
         }
 
@@ -271 +299 @@
             dev->name);
 
+        return rc;
+
+error:
+        if (fun)
+                ddf_fun_destroy(fun);
+        if (need_cleanup)
+                rtc_dev_cleanup(rtc);
         return rc;
 }