Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 70ffe6e1 authored by Alan Stern's avatar Alan Stern Committed by Greg Kroah-Hartman
Browse files

[PATCH] USB: g_file_storage: Set short_not_ok for bulk-out transfers 



I'm told that some UDC hardware may work better if it knows that
receiving a short packet should always cause an error.  Accordingly,
this patch (as663) sets the short_not_ok flag for bulk-out transfers in
g_file_storage.  Oddly enough, there are no circumstances where that
driver can legally receive a shorter-than-expected bulk-out packet.

Signed-off-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 7e1c0b86

drivers/usb/gadget/file_storage.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -1795,6 +1795,7 @@ static int do_write(struct fsg_dev *fsg) 
			 * the bulk-out maxpacket size */

			 * the bulk-out maxpacket size */

			bh->outreq->length = bh->bulk_out_intended_length =

			bh->outreq->length = bh->bulk_out_intended_length =

					amount;

					amount;

			bh->outreq->short_not_ok = 1;

			start_transfer(fsg, fsg->bulk_out, bh->outreq,

			start_transfer(fsg, fsg->bulk_out, bh->outreq,

					&bh->outreq_busy, &bh->state);

					&bh->outreq_busy, &bh->state);

			fsg->next_buffhd_to_fill = bh->next;

			fsg->next_buffhd_to_fill = bh->next;
@@ -2398,6 +2399,7 @@ static int throw_away_data(struct fsg_dev *fsg) 
			 * the bulk-out maxpacket size */

			 * the bulk-out maxpacket size */

			bh->outreq->length = bh->bulk_out_intended_length =

			bh->outreq->length = bh->bulk_out_intended_length =

					amount;

					amount;

			bh->outreq->short_not_ok = 1;

			start_transfer(fsg, fsg->bulk_out, bh->outreq,

			start_transfer(fsg, fsg->bulk_out, bh->outreq,

					&bh->outreq_busy, &bh->state);

					&bh->outreq_busy, &bh->state);

			fsg->next_buffhd_to_fill = bh->next;

			fsg->next_buffhd_to_fill = bh->next;
@@ -3029,6 +3031,7 @@ static int get_next_command(struct fsg_dev *fsg) 




		/* Queue a request to read a Bulk-only CBW */

		/* Queue a request to read a Bulk-only CBW */

		set_bulk_out_req_length(fsg, bh, USB_BULK_CB_WRAP_LEN);

		set_bulk_out_req_length(fsg, bh, USB_BULK_CB_WRAP_LEN);

		bh->outreq->short_not_ok = 1;

		start_transfer(fsg, fsg->bulk_out, bh->outreq,

		start_transfer(fsg, fsg->bulk_out, bh->outreq,

				&bh->outreq_busy, &bh->state);

				&bh->outreq_busy, &bh->state);