diff --git a/[refs] b/[refs]
index 5040293da6d8..1474eb37d26e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cb53237513bd1e090cce120efe12ede72c932b5f
+refs/heads/master: 8c363afe94b885d39ae2e93e41680282a470ad84
diff --git a/trunk/drivers/misc/c2port/core.c b/trunk/drivers/misc/c2port/core.c
index b5346b4db91a..b7a85f46a6c2 100644
--- a/trunk/drivers/misc/c2port/core.c
+++ b/trunk/drivers/misc/c2port/core.c
@@ -912,8 +912,8 @@ struct c2port_device *c2port_device_register(char *name,
 
 	c2dev->dev = device_create(c2port_class, NULL, 0, c2dev,
 					"c2port%d", id);
-	if (unlikely(!c2dev->dev)) {
-		ret = -ENOMEM;
+	if (unlikely(IS_ERR(c2dev->dev))) {
+		ret = PTR_ERR(c2dev->dev);
 		goto error_device_create;
 	}
 	dev_set_drvdata(c2dev->dev, c2dev);