Changeset e9d15d9 in mainline for uspace/drv/nic/rtl8139/driver.c
- Timestamp:
- 2017-08-18T21:15:26Z (7 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 24abb85d
- Parents:
- 1c85bae
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/drv/nic/rtl8139/driver.c
r1c85bae re9d15d9 881 881 * @param nic_data The driver data 882 882 * 883 * @return EOK if the handler was registered, negative error code otherwise 883 * @return IRQ capability if the handler was registered. 884 * @return Negative error code otherwise. 884 885 */ 885 886 inline static int rtl8139_register_int_handler(nic_t *nic_data) … … 894 895 rtl8139_irq_code.cmds[2].addr = rtl8139->io_addr + ISR; 895 896 rtl8139_irq_code.cmds[3].addr = rtl8139->io_addr + IMR; 896 int rc= register_interrupt_handler(nic_get_ddf_dev(nic_data),897 int cap = register_interrupt_handler(nic_get_ddf_dev(nic_data), 897 898 rtl8139->irq, rtl8139_interrupt_handler, &rtl8139_irq_code); 898 899 899 900 RTL8139_IRQ_STRUCT_UNLOCK(); 900 901 901 return rc;902 return cap; 902 903 } 903 904 … … 1321 1322 1322 1323 /* Register interrupt handler */ 1323 rc = rtl8139_register_int_handler(nic_data); 1324 if (rc != EOK) 1324 int irq_cap = rtl8139_register_int_handler(nic_data); 1325 if (irq_cap < 0) { 1326 rc = irq_cap; 1325 1327 goto err_pio; 1328 } 1326 1329 1327 1330 fun = ddf_fun_create(nic_get_ddf_dev(nic_data), fun_exposed, "port0"); … … 1355 1358 ddf_fun_destroy(fun); 1356 1359 err_srv: 1357 unregister_interrupt_handler(dev, rtl8139->irq);1360 unregister_interrupt_handler(dev, irq_cap); 1358 1361 err_pio: 1359 1362 // rtl8139_pio_disable(dev);
Note:
See TracChangeset
for help on using the changeset viewer.