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

Commit 09a0f2ba 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: u_bam: Check IPA resource only for BAM2BAM_IPA mode"

parents f883f588 5e468e3f

drivers/usb/gadget/u_bam.c

+4 −2
Original line number Diff line number Diff line
@@ -459,7 +459,8 @@ static void gbam_data_write_tobam(struct work_struct *w) 
	}



	while (d->pending_with_bam < bam_pending_limit &&

	       usb_bam_get_prod_granted(d->dst_connection_idx)) {

			(d->trans != USB_GADGET_XPORT_BAM2BAM_IPA ||

			usb_bam_get_prod_granted(d->dst_connection_idx))) {

		skb =  __skb_dequeue(&d->rx_skb_q);

		if (!skb)

			break;
@@ -575,7 +576,8 @@ gbam_epout_complete(struct usb_ep *ep, struct usb_request *req) 


	if (queue) {

		__skb_queue_tail(&d->rx_skb_q, skb);

		if (!usb_bam_get_prod_granted(d->dst_connection_idx)) {

		if ((d->trans == USB_GADGET_XPORT_BAM2BAM_IPA) &&

			!usb_bam_get_prod_granted(d->dst_connection_idx)) {

			list_add_tail(&req->list, &d->rx_idle);

			spin_unlock(&port->port_lock_ul);

			return;