diff --git a/[refs] b/[refs]
index b2e55add07f6..19a4c25f551d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c48cd659892962f79bba4b4e0eedea8e5aa54c44
+refs/heads/master: d98642c3eebddac508ed0dcd9ae3951126ef1501
diff --git a/trunk/arch/arm/mach-imx/devices/devices.c b/trunk/arch/arm/mach-imx/devices/devices.c
index 1b37482407f9..1b4366a0e7c0 100644
--- a/trunk/arch/arm/mach-imx/devices/devices.c
+++ b/trunk/arch/arm/mach-imx/devices/devices.c
@@ -37,7 +37,7 @@ int __init mxc_device_init(void)
 	int ret;
 
 	ret = device_register(&mxc_aips_bus);
-	if (IS_ERR_VALUE(ret))
+	if (ret < 0)
 		goto done;
 
 	ret = device_register(&mxc_ahb_bus);