Changes in uspace/drv/char/i8042/i8042.c [75751db6:cccd60c3] in mainline

File:

• uspace/drv/char/i8042/i8042.c (modified) (3 diffs)

uspace/drv/char/i8042/i8042.c

@@ -269 +269 @@
         };
         
-        rc = register_interrupt_handler(ddf_dev, irq_kbd, i8042_irq_handler,
-            &irq_code);
-        if (rc != EOK) {
+        const int irq_kbd_cap = register_interrupt_handler(ddf_dev, irq_kbd,
+            i8042_irq_handler, &irq_code);
+        if (irq_kbd_cap < 0) {
+                rc = irq_kbd_cap;
                 ddf_msg(LVL_ERROR, "Failed set handler for kbd: %s.",
                     ddf_dev_get_name(ddf_dev));
@@ -277 +278 @@
         }
         
-        rc = register_interrupt_handler(ddf_dev, irq_mouse, i8042_irq_handler,
-            &irq_code);
-        if (rc != EOK) {
+        const int irq_mouse_cap = register_interrupt_handler(ddf_dev, irq_mouse,
+            i8042_irq_handler, &irq_code);
+        if (irq_mouse_cap < 0) {
+                rc = irq_mouse_cap;
                 ddf_msg(LVL_ERROR, "Failed set handler for mouse: %s.",
                     ddf_dev_get_name(ddf_dev));
@@ -289 +291 @@
         assert(parent_sess != NULL);
         
-        const bool enabled = hw_res_enable_interrupt(parent_sess);
-        if (!enabled) {
-                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed to enable interrupts: %s.",
+        rc = hw_res_enable_interrupt(parent_sess, irq_kbd);
+        if (rc != EOK) {
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed to enable keyboard interrupt: %s.",
+                    ddf_dev_get_name(ddf_dev));
+                rc = EIO;
+                goto error;
+        }
+
+        rc = hw_res_enable_interrupt(parent_sess, irq_mouse);
+        if (rc != EOK) {
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed to enable mouse interrupt: %s.",
                     ddf_dev_get_name(ddf_dev));
                 rc = EIO;