diff --git a/[refs] b/[refs]
index b10f0f4537be..d92bb3e1f68a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fc8d91912694859d3e598839af2427ec1287741c
+refs/heads/master: 8356f3113d2628c98a58180ca183345474a9d011
diff --git a/trunk/drivers/usb/gadget/serial.c b/trunk/drivers/usb/gadget/serial.c
index e6c19aa4bef3..e552668d36b3 100644
--- a/trunk/drivers/usb/gadget/serial.c
+++ b/trunk/drivers/usb/gadget/serial.c
@@ -1699,6 +1699,7 @@ static int gs_setup_class(struct usb_gadget *gadget,
 			memcpy(&port->port_line_coding, req->buf, ret);
 			spin_unlock(&port->port_lock);
 		}
+		ret = 0;
 		break;
 
 	case USB_CDC_REQ_GET_LINE_CODING: