diff --git a/drivers/base/core.c b/drivers/base/core.c
index e16840886f14c..d02501933467d 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -4170,7 +4170,7 @@ device_create_groups_vargs(struct class *class, struct device *parent,
 	struct device *dev = NULL;
 	int retval = -ENODEV;
 
-	if (class == NULL || IS_ERR(class))
+	if (IS_ERR_OR_NULL(class))
 		goto error;
 
 	dev = kzalloc(sizeof(*dev), GFP_KERNEL);