diff --git a/[refs] b/[refs]
index 833c90b67a2c..175f7d226e4d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e18162353afbb1b58622add7ea0f7a78c11ee44a
+refs/heads/master: 0ca2d6e65268477a53f959320a43d13b0c4d6b70
diff --git a/trunk/drivers/regulator/tps65090-regulator.c b/trunk/drivers/regulator/tps65090-regulator.c
index 6c28e3a3f664..470ca7e366cf 100644
--- a/trunk/drivers/regulator/tps65090-regulator.c
+++ b/trunk/drivers/regulator/tps65090-regulator.c
@@ -153,7 +153,7 @@ static int __devinit tps65090_regulator_probe(struct platform_device *pdev)
 
 	rdev = regulator_register(&ri->desc, &pdev->dev,
 				&tps_pdata->regulator, ri, NULL);
-	if (IS_ERR_OR_NULL(rdev)) {
+	if (IS_ERR(rdev)) {
 		dev_err(&pdev->dev, "failed to register regulator %s\n",
 				ri->desc.name);
 		return PTR_ERR(rdev);