---

yaml
---
r: 185383
b: refs/heads/master
c: b00ce11
h: refs/heads/master
i:
  185381: 4102685
  185379: 6920c88
  185375: 2b4f3bd
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7f1ee82695654faf0a93fc0abf3b08eb354ef1f6
+refs/heads/master: b00ce11f00c9e86442de000e8bd3dd42f089c8e1

trunk/drivers/usb/gadget/f_mass_storage.c

@@ -618,7 +618,12 @@ static int fsg_setup(struct usb_function *f,
 			return -EDOM;
 		VDBG(fsg, "get max LUN\n");
 		*(u8 *) req->buf = fsg->common->nluns - 1;
-		return 1;
+
+		/* Respond with data/status */
+		req->length = min(1, w_length);
+		fsg->common->ep0req_name =
+			ctrl->bRequestType & USB_DIR_IN ? "ep0-in" : "ep0-out";
+		return ep0_queue(fsg->common);
 	}
 
 	VDBG(fsg,
@@ -2528,14 +2533,6 @@ static void handle_exception(struct fsg_common *common)
 
 	case FSG_STATE_CONFIG_CHANGE:
 		rc = do_set_config(common, new_config);
-		if (common->ep0_req_tag != exception_req_tag)
-			break;
-		if (rc != 0) {			/* STALL on errors */
-			DBG(common, "ep0 set halt\n");
-			usb_ep_set_halt(common->ep0);
-		} else {			/* Complete the status stage */
-			ep0_queue(common);
-		}
 		break;
 
 	case FSG_STATE_EXIT: