diff --git a/[refs] b/[refs]
index f03f5d1a8bc5..336c8c899dfa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: df23fa01acc77444453633e1dec59cd7a4ea8ec3
+refs/heads/master: c5999f0da73b7f46435a67671c8861ed14a94c4e
diff --git a/trunk/drivers/usb/core/endpoint.c b/trunk/drivers/usb/core/endpoint.c
index 5e628ae3aec7..e0ec7045e865 100644
--- a/trunk/drivers/usb/core/endpoint.c
+++ b/trunk/drivers/usb/core/endpoint.c
@@ -229,7 +229,7 @@ static int init_endpoint_class(void)
 	kref_init(&ep_class->kref);
 	ep_class->class = class_create(THIS_MODULE, "usb_endpoint");
 	if (IS_ERR(ep_class->class)) {
-		result = IS_ERR(ep_class->class);
+		result = PTR_ERR(ep_class->class);
 		goto class_create_error;
 	}