diff --git a/[refs] b/[refs]
index cd7ffd153389..7501822f2ae4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f415c413f458837bd0c27086b79aca889f9435e4
+refs/heads/master: 054b2b13ccba4876a1ce98a7ede7dab7d6893d01
diff --git a/trunk/drivers/pps/pps.c b/trunk/drivers/pps/pps.c
index ac8cc8cea1e3..fea17e7805e9 100644
--- a/trunk/drivers/pps/pps.c
+++ b/trunk/drivers/pps/pps.c
@@ -244,7 +244,7 @@ int pps_register_cdev(struct pps_device *pps)
 	}
 	pps->dev = device_create(pps_class, pps->info.dev, pps->devno, NULL,
 							"pps%d", pps->id);
-	if (err)
+	if (IS_ERR(pps->dev))
 		goto del_cdev;
 	dev_set_drvdata(pps->dev, pps);