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

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

Merge "usb: gadget: ffs: Forbid usb_ep_alloc_request from sleeping"

parents 71721a67 6fa3495c
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -1187,7 +1187,7 @@ static ssize_t ffs_epfile_io(struct file *file, struct ffs_io_data *io_data)
			ret = __ffs_epfile_read_data(epfile, data, ep->status,
						     &io_data->data);
		goto error_mutex;
	} else if (!(req = usb_ep_alloc_request(ep->ep, GFP_KERNEL))) {
	} else if (!(req = usb_ep_alloc_request(ep->ep, GFP_ATOMIC))) {
		ret = -ENOMEM;
	} else {
		req->buf      = data;