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

[skel] Check for ioremap() failures

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

diff --git a/src/drivers/net/skeleton.c b/src/drivers/net/skeleton.c
index e50b778a8..365111b8d 100644
--- a/src/drivers/net/skeleton.c
+++ b/src/drivers/net/skeleton.c
@@ -241,6 +241,10 @@ static int skeleton_probe ( struct pci_device *pci ) {
 
 	/* Map registers */
 	skel->regs = ioremap ( pci->membase, SKELETON_BAR_SIZE );
+	if ( ! skel->regs ) {
+		rc = -ENODEV;
+		goto err_ioremap;
+	}
 
 	/* Reset the NIC */
 	if ( ( rc = skeleton_reset ( skel ) ) != 0 )
@@ -269,6 +273,7 @@ static int skeleton_probe ( struct pci_device *pci ) {
 	skeleton_reset ( skel );
  err_reset:
 	iounmap ( skel->regs );
+ err_ioremap:
 	netdev_nullify ( netdev );
 	netdev_put ( netdev );
  err_alloc: