svn commit: r279780 - head/sys/arm/broadcom/bcm2835

[Andrew Turner]

Author: andrew
Date: Sun Mar  8 14:15:57 2015
New Revision: 279780
URL: https://svnweb.freebsd.org/changeset/base/279780

Log:
  Call config_intrhook_disestablish on failure of the bcm2835 fb and fbd intr
  hooks. With this we can get through the boot even if these functions fail.
  
  Sponsored by:	ABT Systems Ltd

Modified:
  head/sys/arm/broadcom/bcm2835/bcm2835_fb.c
  head/sys/arm/broadcom/bcm2835/bcm2835_fbd.c

Modified: head/sys/arm/broadcom/bcm2835/bcm2835_fb.c
==============================================================================
--- head/sys/arm/broadcom/bcm2835/bcm2835_fb.c	Sun Mar  8 14:12:43 2015	(r279779)
+++ head/sys/arm/broadcom/bcm2835/bcm2835_fb.c	Sun Mar  8 14:15:57 2015	(r279780)
@@ -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);

Modified: head/sys/arm/broadcom/bcm2835/bcm2835_fbd.c
==============================================================================
--- head/sys/arm/broadcom/bcm2835/bcm2835_fbd.c	Sun Mar  8 14:12:43 2015	(r279779)
+++ head/sys/arm/broadcom/bcm2835/bcm2835_fbd.c	Sun Mar  8 14:15:57 2015	(r279780)
@@ -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);