narenas
/
opengnsys_ipxe
mirror of https://github.com/ipxe/ipxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[intel] Check for ioremap() failures 

Debugged-by: Anton D. Kachalov <mouse@yandex-team.ru>
Signed-off-by: Michael Brown <mcb30@ipxe.org>
pull/20/merge
Michael Brown 2014-07-16 15:49:08 +01:00
parent ae778091ca
commit 9ce2b56af6
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/drivers/net/intel.c
View File

@ -819,6 +819,10 @@ static int intel_probe ( struct pci_device *pci ) {
/* Map registers */ /* Map registers */
intel->regs = ioremap ( pci->membase, INTEL_BAR_SIZE ); intel->regs = ioremap ( pci->membase, INTEL_BAR_SIZE );
if ( ! intel->regs ) {
rc = -ENODEV;
goto err_ioremap;
}
/* Reset the NIC */ /* Reset the NIC */
if ( ( rc = intel_reset ( intel ) ) != 0 ) if ( ( rc = intel_reset ( intel ) ) != 0 )
@ -843,6 +847,7 @@ static int intel_probe ( struct pci_device *pci ) {
intel_reset ( intel ); intel_reset ( intel );
err_reset: err_reset:
iounmap ( intel->regs ); iounmap ( intel->regs );
err_ioremap:
netdev_nullify ( netdev ); netdev_nullify ( netdev );
netdev_put ( netdev ); netdev_put ( netdev );
err_alloc: err_alloc:

5
src/drivers/net/intelx.c
View File

@ -400,6 +400,10 @@ static int intelx_probe ( struct pci_device *pci ) {
/* Map registers */ /* Map registers */
intel->regs = ioremap ( pci->membase, INTEL_BAR_SIZE ); intel->regs = ioremap ( pci->membase, INTEL_BAR_SIZE );
if ( ! intel->regs ) {
rc = -ENODEV;
goto err_ioremap;
}
/* Reset the NIC */ /* Reset the NIC */
if ( ( rc = intelx_reset ( intel ) ) != 0 ) if ( ( rc = intelx_reset ( intel ) ) != 0 )
@ -424,6 +428,7 @@ static int intelx_probe ( struct pci_device *pci ) {
intelx_reset ( intel ); intelx_reset ( intel );
err_reset: err_reset:
iounmap ( intel->regs ); iounmap ( intel->regs );
err_ioremap:
netdev_nullify ( netdev ); netdev_nullify ( netdev );
netdev_put ( netdev ); netdev_put ( netdev );
err_alloc: err_alloc: