summaryrefslogtreecommitdiff
path: root/drivers/pps/pps.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-03-24 19:13:59 +0000
committerArnd Bergmann <arnd@arndb.de>2012-03-24 19:13:59 +0000
commit83fe628e16d84efc8df2731bc403eae4e4f53801 (patch)
tree9a51c292235621d0f4f632c2a55ddb5a6ab582af /drivers/pps/pps.c
parent853a0231e057c04255a848f6998f84faaa635c58 (diff)
parent426f1af947c61dee48a9267f84bff227e503a547 (diff)
Merge branch 'renesas/soc' into next/soc2
Diffstat (limited to 'drivers/pps/pps.c')
-rw-r--r--drivers/pps/pps.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pps/pps.c b/drivers/pps/pps.c
index 2baadd21b7a6..98fbe62694d4 100644
--- a/drivers/pps/pps.c
+++ b/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;