diff --git a/[refs] b/[refs]
index 34fa8cb1d868..3decb6da0d4a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f863440d54fccbcd0ef0f6d96d81521e0fa41e35
+refs/heads/master: 23cbd4e84f98b36c91d19990760207112f142c5b
diff --git a/trunk/arch/arm/mach-tegra/tegra2_emc.c b/trunk/arch/arm/mach-tegra/tegra2_emc.c
index e18aa2f83ebf..03e742f0a8cc 100644
--- a/trunk/arch/arm/mach-tegra/tegra2_emc.c
+++ b/trunk/arch/arm/mach-tegra/tegra2_emc.c
@@ -276,7 +276,7 @@ static struct tegra_emc_pdata *tegra_emc_fill_pdata(struct platform_device *pdev
 	int i;
 
 	WARN_ON(pdev->dev.platform_data);
-	BUG_ON(IS_ERR_OR_NULL(c));
+	BUG_ON(IS_ERR(c));
 
 	pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);
 	pdata->tables = devm_kzalloc(&pdev->dev, sizeof(*pdata->tables),