mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2025-01-07 13:14:51 +00:00
Code Issues Releases Activity

Call config_intrhook_disestablish on failure of the bcm2835 fb and fbd intr

Browse Source 
hooks. With this we can get through the boot even if these functions fail.

Sponsored by:	ABT Systems Ltd
This commit is contained in:
Andrew Turner 2015-03-08 14:15:57 +00:00
parent 6ab1d4d9c3
commit 686513878d
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=279780
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sys/arm/broadcom/bcm2835/bcm2835_fb.c
View File

@ -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);

9
sys/arm/broadcom/bcm2835/bcm2835_fbd.c
View File

@ -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);