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

Commit a9eb632c authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "USB: f_mtp: Check if the ep is not disabled before queuing it" into msm-4.8

parents a5e0571d 1597fd67

drivers/usb/gadget/function/f_mtp.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -912,7 +912,8 @@ static void receive_file_work(struct work_struct *data) 
			/* wait for our last read to complete */

			/* wait for our last read to complete */

			ret = wait_event_interruptible(dev->read_wq,

			ret = wait_event_interruptible(dev->read_wq,

				dev->rx_done || dev->state != STATE_BUSY);

				dev->rx_done || dev->state != STATE_BUSY);

			if (dev->state == STATE_CANCELED) {

			if (dev->state == STATE_CANCELED

					|| dev->state == STATE_OFFLINE) {

				r = -ECANCELED;

				r = -ECANCELED;

				if (!dev->rx_done)

				if (!dev->rx_done)

					usb_ep_dequeue(dev->ep_out, read_req);

					usb_ep_dequeue(dev->ep_out, read_req);