X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Fdrv%2Fpci.c;h=20eb93261ec6cee8bc44f1028559ad4418c9fccd;hb=e29b02ca55d580b2f7f10d1093c3d6ad1bc59458;hp=e205d4f4116f8c54fef8549bcd0d638d736bf7e4;hpb=775bf8013abe9fe4ef3d4883ea2e43bba2a84da1;p=tpg%2Facess2.git

diff --git a/Kernel/drv/pci.c b/Kernel/drv/pci.c
index e205d4f4..20eb9326 100644
--- a/Kernel/drv/pci.c
+++ b/Kernel/drv/pci.c
@@ -88,6 +88,10 @@ int PCI_Install(char **Arguments)
 	
 	// Build Portmap
 	gaPCI_PortBitmap = malloc( 1 << 13 );
+	if( !gaPCI_PortBitmap ) {
+		Log_Error("PCI", "Unable to allocate %i bytes for bitmap", 1 << 13);
+		return MODULE_ERR_MALLOC;
+	}
 	memset( gaPCI_PortBitmap, 0, 1 << 13 );
 	for( i = 0; i < MAX_RESERVED_PORT / 32; i ++ )
 		gaPCI_PortBitmap[i] = -1;
@@ -110,7 +114,7 @@ int PCI_Install(char **Arguments)
 					space += SPACE_STEP;
 					tmpPtr = realloc(gPCI_Devices, space*sizeof(tPCIDevice));
 					if(tmpPtr == NULL)
-						break;
+						return MODULE_ERR_MALLOC;
 					gPCI_Devices = tmpPtr;
 				}
 				if(devInfo.oc == PCI_OC_PCIBRIDGE)
@@ -141,15 +145,13 @@ int PCI_Install(char **Arguments)
 						break;
 				}
 			}
-			if(tmpPtr != gPCI_Devices)
-				break;
 		}
-		if(tmpPtr != gPCI_Devices)
-			break;
 	}
 	
-	if(giPCI_DeviceCount == 0)
+	if(giPCI_DeviceCount == 0) {
+		Log_Notice("PCI", "No devices were found");
 		return MODULE_ERR_NOTNEEDED;
+	}
 	
 	tmpPtr = realloc(gPCI_Devices, giPCI_DeviceCount*sizeof(tPCIDevice));
 	if(tmpPtr == NULL)