Changeset de16f89 in mainline for uspace/drv/audio/hdaudio/hdactl.c

Timestamp:

2014-09-05T08:52:51Z (10 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

089901e

Parents:

3fec817

Message:

Add cleanup code to error paths.

File:

• uspace/drv/audio/hdaudio/hdactl.c (modified) (4 diffs)

uspace/drv/audio/hdaudio/hdactl.c

@@ -217 +217 @@
         return EOK;
 error:
+        if (hda->ctl->corb_virt != NULL)
+                dmamem_unmap_anonymous(&hda->ctl->corb_virt);
         return EIO;
+}
+
+/** Tear down the CORB */
+static void hda_corb_fini(hda_t *hda)
+{
+        uint8_t ctl;
+
+        /* Stop CORB */
+        ctl = hda_reg8_read(&hda->regs->corbctl);
+        hda_reg8_write(&hda->regs->corbctl, ctl & ~BIT_V(uint8_t, corbctl_run));
+
+        if (hda->ctl->corb_virt != NULL)
+                dmamem_unmap_anonymous(&hda->ctl->corb_virt);
 }
 
@@ -290 +305 @@
         return EOK;
 error:
+        if (hda->ctl->rirb_virt != NULL)
+                dmamem_unmap_anonymous(&hda->ctl->rirb_virt);
         return EIO;
+}
+
+/** Tear down the RIRB */
+static void hda_rirb_fini(hda_t *hda)
+{
+        uint8_t ctl;
+
+        /* Stop RIRB and disable RIRB interrupt */
+        ctl = hda_reg8_read(&hda->regs->rirbctl);
+        hda_reg8_write(&hda->regs->rirbctl, ctl &
+            ~(BIT_V(uint8_t, rirbctl_run) | BIT_V(uint8_t, rirbctl_int)));
+
+        if (hda->ctl->rirb_virt != NULL)
+                dmamem_unmap_anonymous(&hda->ctl->rirb_virt);
 }
 
@@ -571 +602 @@
         return ctl;
 error:
+        hda_rirb_fini(hda);
+        hda_corb_fini(hda);
         free(ctl);
         hda->ctl = NULL;
         return NULL;
+}
+
+void hda_ctl_fini(hda_ctl_t *ctl)
+{
+        ddf_msg(LVL_NOTE, "hda_ctl_fini()");
+        hda_rirb_fini(ctl->hda);
+        hda_corb_fini(ctl->hda);
+        free(ctl);
 }
 
@@ -595 +636 @@
 
         return EOK;
-}
-
-void hda_ctl_fini(hda_ctl_t *ctl)
-{
-        ddf_msg(LVL_NOTE, "hda_ctl_fini()");
-        free(ctl);
 }