diff --git a/[refs] b/[refs]
index 59b675b9493d..42966af623e0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6027ce497d44dd8eae1a9215789df178f6b422cc
+refs/heads/master: 7ad12566dc02ca76e0056af58606b5ce0181460f
diff --git a/trunk/drivers/pps/pps.c b/trunk/drivers/pps/pps.c
index 2baadd21b7a6..98fbe62694d4 100644
--- a/trunk/drivers/pps/pps.c
+++ b/trunk/drivers/pps/pps.c
@@ -369,9 +369,9 @@ static int __init pps_init(void)
 	int err;
 
 	pps_class = class_create(THIS_MODULE, "pps");
-	if (!pps_class) {
+	if (IS_ERR(pps_class)) {
 		pr_err("failed to allocate class\n");
-		return -ENOMEM;
+		return PTR_ERR(pps_class);
 	}
 	pps_class->dev_attrs = pps_attrs;