Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux

[firefly-linux-kernel-4.4.55.git] / arch / arm / mach-omap1 / board-perseus2.c

diff --git a/arch/arm/mach-omap1/board-perseus2.c b/arch/arm/mach-omap1/board-perseus2.c
index 9a7e483ed6fded7c2db6684963e35dd7879d14ac..27f8d12ec222034d23d3b7f8438614356e4ad7f1 100644 (file)
--- a/arch/arm/mach-omap1/board-perseus2.c
+++ b/arch/arm/mach-omap1/board-perseus2.c
@@ -275,8 +275,7 @@ static void __init omap_perseus2_init(void)
 
        perseus2_init_smc91x();
 
-       if (gpio_request(P2_NAND_RB_GPIO_PIN, "NAND ready") < 0)
-               BUG();
+       BUG_ON(gpio_request(P2_NAND_RB_GPIO_PIN, "NAND ready") < 0);
        gpio_direction_input(P2_NAND_RB_GPIO_PIN);
 
        omap_cfg_reg(L3_1610_FLASH_CS2B_OE);