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

Commit e49d49a3 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "USB: gagget: f_fs: Return error if TX req is queued during device offline"

parents e9ccaa5b beafbd43

drivers/usb/gadget/function/f_fs.c

+8 −2
Original line number Diff line number Diff line
@@ -760,8 +760,8 @@ static ssize_t ffs_epfile_io(struct file *file, struct ffs_io_data *io_data) 
	ssize_t ret, data_len = -EINVAL;

	int halt;



	ffs_log("enter: epfile name %s epfile err %d", epfile->name,

		atomic_read(&epfile->error));

	ffs_log("enter: epfile name %s epfile err %d (%s)", epfile->name,

		atomic_read(&epfile->error), io_data->read ? "READ" : "WRITE");



	smp_mb__before_atomic();

	if (atomic_read(&epfile->error))
@@ -781,6 +781,12 @@ static ssize_t ffs_epfile_io(struct file *file, struct ffs_io_data *io_data) 
			goto error;

		}



		/* Don't wait on write if device is offline */

		if (!io_data->read) {

			ret = -EINTR;

			goto error;

		}



		/*

		 * If ep is disabled, this fails all current IOs

		 * and wait for next epfile open to happen.