diff --git a/[refs] b/[refs]
index 5afd3a5e27fa..8b88068259e3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 99d4b1a6cbfa8449dad5fb58e8c8044301e2667a
+refs/heads/master: 7505817603854506732affb584ef6568a4702d6f
diff --git a/trunk/drivers/staging/ccg/ccg.c b/trunk/drivers/staging/ccg/ccg.c
index 565249b2d755..3fbb300cbe30 100644
--- a/trunk/drivers/staging/ccg/ccg.c
+++ b/trunk/drivers/staging/ccg/ccg.c
@@ -1101,13 +1101,7 @@ static struct device_attribute *ccg_usb_attributes[] = {
 static int ccg_bind_config(struct usb_configuration *c)
 {
 	struct ccg_dev *dev = _ccg_dev;
-	int ret = 0;
-
-	ret = ccg_bind_enabled_functions(dev, c);
-	if (ret)
-		return ret;
-
-	return 0;
+	return ccg_bind_enabled_functions(dev, c);
 }
 
 static void ccg_unbind_config(struct usb_configuration *c)