Changeset 224174f in mainline for uspace/drv/char/ns8250/ns8250.c

Timestamp:

2013-07-11T13:16:57Z (11 years ago)

Author:

Manuele Conti <conti.ma@…>

Branches:

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

Children:

2b3e8840, b2c96093

Parents:

990ab7d (diff), 3a67d63 (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/drv/char/ns8250/ns8250.c (modified) (5 diffs)

uspace/drv/char/ns8250/ns8250.c

@@ -420 +420 @@
                         ns->irq = res->res.interrupt.irq;
                         irq = true;
-                        ddf_msg(LVL_NOTE, "Device %s was asigned irq = 0x%x.",
+                        ddf_msg(LVL_NOTE, "Device %s was assigned irq = 0x%x.",
                             ddf_dev_get_name(ns->dev), ns->irq);
                         break;
@@ -433 +433 @@
                         }
                         ioport = true;
-                        ddf_msg(LVL_NOTE, "Device %s was asigned I/O address = "
+                        ddf_msg(LVL_NOTE, "Device %s was assigned I/O address = "
                             "0x%x.", ddf_dev_get_name(ns->dev), ns->io_addr);
                         break;
@@ -827 +827 @@
         ddf_fun_t *fun = NULL;
         bool need_cleanup = false;
+        bool need_unreg_intr_handler = false;
         int rc;
         
@@ -869 +870 @@
                 goto fail;
         }
+        need_unreg_intr_handler = true;
         
         /* Enable interrupt. */
@@ -903 +905 @@
         if (fun != NULL)
                 ddf_fun_destroy(fun);
+        if (need_unreg_intr_handler)
+                ns8250_unregister_interrupt_handler(ns);
         if (need_cleanup)
                 ns8250_dev_cleanup(ns);