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

Commit fa4c86a0 authored by Matthias Kaehlcke's avatar Matthias Kaehlcke Committed by Greg Kroah-Hartman
Browse files

USB: gadgetfs: use helper functions to determine endpoint type and direction 



Use helper functions to determine the type and direction of an endpoint
instead of fiddling with bEndpointAddress and bmAttributes

Signed-off-by: default avatarMatthias Kaehlcke <matthias@kaehlcke.net>
Acked-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 9ab15651

drivers/usb/gadget/inode.c

+6 −8
Original line number Diff line number Diff line
@@ -384,9 +384,8 @@ ep_read (struct file *fd, char __user *buf, size_t len, loff_t *ptr) 
		return value;



	/* halt any endpoint by doing a "wrong direction" i/o call */

	if (data->desc.bEndpointAddress & USB_DIR_IN) {

		if ((data->desc.bmAttributes & USB_ENDPOINT_XFERTYPE_MASK)

				== USB_ENDPOINT_XFER_ISOC)

	if (usb_endpoint_dir_in(&data->desc)) {

		if (usb_endpoint_xfer_isoc(&data->desc))

			return -EINVAL;

		DBG (data->dev, "%s halt\n", data->name);

		spin_lock_irq (&data->dev->lock);
@@ -428,9 +427,8 @@ ep_write (struct file *fd, const char __user *buf, size_t len, loff_t *ptr) 
		return value;



	/* halt any endpoint by doing a "wrong direction" i/o call */

	if (!(data->desc.bEndpointAddress & USB_DIR_IN)) {

		if ((data->desc.bmAttributes & USB_ENDPOINT_XFERTYPE_MASK)

				== USB_ENDPOINT_XFER_ISOC)

	if (!usb_endpoint_dir_in(&data->desc)) {

		if (usb_endpoint_xfer_isoc(&data->desc))

			return -EINVAL;

		DBG (data->dev, "%s halt\n", data->name);

		spin_lock_irq (&data->dev->lock);
@@ -691,7 +689,7 @@ ep_aio_read(struct kiocb *iocb, const struct iovec *iov, 
	struct ep_data		*epdata = iocb->ki_filp->private_data;

	char			*buf;



	if (unlikely(epdata->desc.bEndpointAddress & USB_DIR_IN))

	if (unlikely(usb_endpoint_dir_in(&epdata->desc)))

		return -EINVAL;



	buf = kmalloc(iocb->ki_left, GFP_KERNEL);
@@ -711,7 +709,7 @@ ep_aio_write(struct kiocb *iocb, const struct iovec *iov, 
	size_t			len = 0;

	int			i = 0;



	if (unlikely(!(epdata->desc.bEndpointAddress & USB_DIR_IN)))

	if (unlikely(!usb_endpoint_dir_in(&epdata->desc)))

		return -EINVAL;



	buf = kmalloc(iocb->ki_left, GFP_KERNEL);