Changes in uspace/drv/nic/e1k/e1k.c [3f74275:582a0b8] in mainline
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/drv/nic/e1k/e1k.c
r3f74275 r582a0b8 1253 1253 * @param nic Driver data 1254 1254 * 1255 * @return IRQ capability handleif the handler was registered1255 * @return EOK if the handler was registered 1256 1256 * @return Negative error code otherwise 1257 1257 * … … 1268 1268 e1000_irq_code.cmds[2].addr = e1000->reg_base_phys + E1000_IMC; 1269 1269 1270 int cap = register_interrupt_handler(nic_get_ddf_dev(nic), e1000->irq,1271 e1000 _interrupt_handler, &e1000_irq_code);1270 int rc = register_interrupt_handler(nic_get_ddf_dev(nic), 1271 e1000->irq, e1000_interrupt_handler, &e1000_irq_code); 1272 1272 1273 1273 fibril_mutex_unlock(&irq_reg_mutex); 1274 return cap;1274 return rc; 1275 1275 } 1276 1276 … … 2152 2152 ddf_fun_set_ops(fun, &e1000_dev_ops); 2153 2153 2154 int irq_cap = e1000_register_int_handler(nic); 2155 if (irq_cap < 0) { 2156 rc = irq_cap; 2154 rc = e1000_register_int_handler(nic); 2155 if (rc != EOK) 2157 2156 goto err_fun_create; 2158 }2159 2157 2160 2158 rc = e1000_initialize_rx_structure(nic); … … 2191 2189 e1000_uninitialize_rx_structure(nic); 2192 2190 err_irq: 2193 unregister_interrupt_handler(dev, irq_cap);2191 unregister_interrupt_handler(dev, DRIVER_DATA_DEV(dev)->irq); 2194 2192 err_fun_create: 2195 2193 ddf_fun_destroy(fun);
Note:
See TracChangeset
for help on using the changeset viewer.