diff --git a/drivers/usb/gadget/function/f_hid.c b/drivers/usb/gadget/function/f_hid.c
index 59ab62c92b66667e77b4ba35cd59f754584e0fd2..f3b3e19281eae72b86e7f0b37ce0fc7ed00618f0 100644
--- a/drivers/usb/gadget/function/f_hid.c
+++ b/drivers/usb/gadget/function/f_hid.c
@@ -742,6 +742,10 @@ int __init ghid_setup(struct usb_gadget *g, int count)
 	dev_t dev;
 
 	hidg_class = class_create(THIS_MODULE, "hidg");
+	if (IS_ERR(hidg_class)) {
+		hidg_class = NULL;
+		return PTR_ERR(hidg_class);
+	}
 
 	status = alloc_chrdev_region(&dev, 0, count, "hidg");
 	if (!status) {