Merge "usb: gadget: f_accessory: Make RX buffer size aligned to EP's MTU" (0a839c17) · Commits · e / devices / android_kernel_sony_msm8994

drivers/usb/gadget/f_accessory.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -596,7 +596,7 @@ static ssize_t acc_read(struct file fp, char __user buf,
		{
		struct acc_dev *dev = fp->private_data;
		struct usb_request *req;
		int r = count, xfer;
		int r = count, xfer, len;
		int ret = 0;

		pr_debug("acc_read(%d)\n", count);
		@@ -607,6 +607,8 @@ static ssize_t acc_read(struct file fp, char __user buf,
		if (count > BULK_BUFFER_SIZE)
		count = BULK_BUFFER_SIZE;

		len = ALIGN(count, dev->ep_out->maxpacket);

		/* we will block until we're online */
		pr_debug("acc_read: waiting for online\n");
		ret = wait_event_interruptible(dev->read_wq, dev->online);
		@@ -618,7 +620,7 @@ static ssize_t acc_read(struct file fp, char __user buf,
		requeue_req:
		/* queue a request */
		req = dev->rx_req[0];
		req->length = count;
		req->length = len;
		dev->rx_done = 0;
		ret = usb_ep_queue(dev->ep_out, req, GFP_KERNEL);
		if (ret < 0) {