diff --git a/drivers/irqchip/irq-mbigen.c b/drivers/irqchip/irq-mbigen.c
index 91059135b007cef3f63ba6829a6d257b3c935738..16090b620496d8e2fb5e76f5b2586f09231bbde6 100644
--- a/drivers/irqchip/irq-mbigen.c
+++ b/drivers/irqchip/irq-mbigen.c
@@ -687,9 +687,6 @@ static int vtimer_mbigen_set_regs(struct platform_device *pdev)
 	u32 val;
 	struct vtimer_mbigen_device *chip;
 
-	if (!vtimer_irqbypass)
-		return 0;
-
 	addr = mgn_chip->base + MBIGEN_CTLR;
 	val = readl_relaxed(addr);
 	mpidr_aff3 = (val & MBIGEN_AFF3_MASK) >> MBIGEN_AFF3_SHIFT;
@@ -767,6 +764,9 @@ static int vtimer_mbigen_device_probe(struct platform_device *pdev)
 	struct vtimer_mbigen_device *vtimer_mgn_chip;
 	int err;
 
+	if (!vtimer_irqbypass)
+		return 0;
+
 	err = vtimer_mbigen_set_regs(pdev);
 	if (err)
 		return err;