diff --git a/[refs] b/[refs]
index 020849c2ade2..e104c743a82c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ba2d5affded07dcdd7b076dfeb4f2eefdf79a997
+refs/heads/master: be3bad6f5eb7205753e0134aeb422c4d9c1d8838
diff --git a/trunk/drivers/input/serio/xilinx_ps2.c b/trunk/drivers/input/serio/xilinx_ps2.c
index d64c5a43aaad..f3e54b9a4a46 100644
--- a/trunk/drivers/input/serio/xilinx_ps2.c
+++ b/trunk/drivers/input/serio/xilinx_ps2.c
@@ -253,7 +253,7 @@ static int __devinit xps2_of_probe(struct platform_device *ofdev)
 	}
 
 	/* Get IRQ for the device */
-	if (of_irq_to_resource(ofdev->dev.of_node, 0, &r_irq) == NO_IRQ) {
+	if (!of_irq_to_resource(ofdev->dev.of_node, 0, &r_irq)) {
 		dev_err(dev, "no IRQ found\n");
 		return -ENODEV;
 	}