From: Michael Brown <mcb30@ipxe.org>
Date: Wed, 16 Jul 2014 14:53:43 +0000 (+0100)
Subject: [myson] Check for ioremap() failures
X-Git-Tag: v1.20.1~1126
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=720ae17aa4c23e4dcf572e4ee74b2e324565e5d4;p=thirdparty%2Fipxe.git

[myson] Check for ioremap() failures

Signed-off-by: Michael Brown <mcb30@ipxe.org>
---

diff --git a/src/drivers/net/myson.c b/src/drivers/net/myson.c
index 237f87210..6abb55660 100644
--- a/src/drivers/net/myson.c
+++ b/src/drivers/net/myson.c
@@ -603,6 +603,10 @@ static int myson_probe ( struct pci_device *pci ) {
 
 	/* Map registers */
 	myson->regs = ioremap ( pci->membase, MYSON_BAR_SIZE );
+	if ( ! myson->regs ) {
+		rc = -ENODEV;
+		goto err_ioremap;
+	}
 
 	/* Reset the NIC */
 	if ( ( rc = myson_reset ( myson ) ) != 0 )
@@ -627,6 +631,7 @@ static int myson_probe ( struct pci_device *pci ) {
 	myson_reset ( myson );
  err_reset:
 	iounmap ( myson->regs );
+ err_ioremap:
 	netdev_nullify ( netdev );
 	netdev_put ( netdev );
  err_alloc: