Changeset 132ab5d1 in mainline for uspace/drv/audio/sb16/main.c

Timestamp:

2018-01-30T03:20:45Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

5a6cc679

Parents:

8bfb163 (diff), 6a5d05b (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 commit '6a5d05bd2551e64111bea4f9332dd7448c26ce84' into forwardport

Separate return value from error code in gen_irq_code*().

File:

• uspace/drv/audio/sb16/main.c (modified) (2 diffs)

uspace/drv/audio/sb16/main.c

@@ -76 +76 @@
 }
 
-static void irq_handler(ipc_callid_t iid, ipc_call_t *call, ddf_dev_t *dev)
+static void irq_handler(ipc_call_t *call, ddf_dev_t *dev)
 {
         sb16_t *sb16_dev = ddf_dev_data_get(dev);
@@ -123 +123 @@
         };
 
-        irq_cap = register_interrupt_handler(device, irq, irq_handler,
-            &irq_code);
-        if (irq_cap < 0) {
-                rc = irq_cap;
+        rc = register_interrupt_handler(device, irq, irq_handler,
+            &irq_code, &irq_cap);
+        if (rc != EOK) {
                 ddf_log_error("Failed to register irq handler: %s.",
                     str_error(rc));