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

Commit b3591f67 authored by Michal Nazarewicz's avatar Michal Nazarewicz Committed by Felipe Balbi
Browse files

usb: f_fs: replace unnecessary goto with a return 



In ffs_epfile_io error label points to a return path which includes
a kfree(data) call.  However, at the beginning of the function data is
always NULL so some of the early ‘goto error’ can safely be replaced
with a trivial return statement.

Signed-off-by: default avatarMichal Nazarewicz <mina86@mina86.com>
Signed-off-by: default avatarFelipe Balbi <balbi@kernel.org>
parent 3163c79e

drivers/usb/gadget/function/f_fs.c

+8 −16
Original line number Diff line number Diff line
@@ -690,32 +690,24 @@ static ssize_t ffs_epfile_io(struct file *file, struct ffs_io_data *io_data) 
	int halt;



	/* Are we still active? */

	if (WARN_ON(epfile->ffs->state != FFS_ACTIVE)) {

		ret = -ENODEV;

		goto error;

	}

	if (WARN_ON(epfile->ffs->state != FFS_ACTIVE))

		return -ENODEV;



	/* Wait for endpoint to be enabled */

	ep = epfile->ep;

	if (!ep) {

		if (file->f_flags & O_NONBLOCK) {

			ret = -EAGAIN;

			goto error;

		}

		if (file->f_flags & O_NONBLOCK)

			return -EAGAIN;



		ret = wait_event_interruptible(epfile->wait, (ep = epfile->ep));

		if (ret) {

			ret = -EINTR;

			goto error;

		}

		if (ret)

			return -EINTR;

	}



	/* Do we halt? */

	halt = (!io_data->read == !epfile->in);

	if (halt && epfile->isoc) {

		ret = -EINVAL;

		goto error;

	}

	if (halt && epfile->isoc)

		return -EINVAL;



	/* Allocate & copy */

	if (!halt) {