Call config_intrhook_disestablish on failure of the bcm2835 fb and fb…

…d intr hooks. With this we can get through the boot even if these functions fail. Sponsored by: ABT Systems Ltd
freebsd · Mar 8, 2015 · 13f561b · 13f561b
1 parent 84c0730
commit 13f561b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_fb.c b/sys/arm/broadcom/bcm2835/bcm2835_fb.c
@@ -240,7 +240,6 @@ bcm_fb_init(void *arg)
 	}
 	else {
 		device_printf(sc->dev, "Failed to set framebuffer info\n");
-		return;
 	}
 
 	config_intrhook_disestablish(&sc->init_hook);

diff --git a/sys/arm/broadcom/bcm2835/bcm2835_fbd.c b/sys/arm/broadcom/bcm2835/bcm2835_fbd.c
@@ -186,17 +186,12 @@ bcm_fb_init(void *arg)
 
 		fbd = device_add_child(sc->dev, "fbd",
 		    device_get_unit(sc->dev));
-		if (fbd == NULL) {
+		if (fbd == NULL)
 			device_printf(sc->dev, "Failed to add fbd child\n");
-			return;
-		}
-		if (device_probe_and_attach(fbd) != 0) {
+		else if (device_probe_and_attach(fbd) != 0)
 			device_printf(sc->dev, "Failed to attach fbd device\n");
-			return;
-		}
 	} else {
 		device_printf(sc->dev, "Failed to set framebuffer info\n");
-		return;
 	}
 
 	config_intrhook_disestablish(&sc->init_hook);