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

Commit 27aed98f 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: set keep_ipa_awake to false for all data functions"

parents 8b2f3b76 f306f94c

drivers/usb/gadget/u_bam.c

+0 −1
Original line number Diff line number Diff line
@@ -1168,7 +1168,6 @@ static void gbam2bam_connect_work(struct work_struct *w) 
		}

		d->ipa_params.ipa_ep_cfg.mode.mode = IPA_BASIC;

		d->ipa_params.skip_ep_cfg = teth_bridge_params.skip_ep_cfg;

		d->ipa_params.keep_ipa_awake = false;

		d->ipa_params.dir = USB_TO_PEER_PERIPHERAL;

		ret = usb_bam_connect_ipa(&d->ipa_params);

		if (ret) {

drivers/usb/gadget/u_bam_data.c

+0 −3
Original line number Diff line number Diff line
@@ -732,14 +732,12 @@ static void bam2bam_data_connect_work(struct work_struct *w) 
			d->ipa_params.ipa_ep_cfg.mode.mode = IPA_BASIC;

			d->ipa_params.skip_ep_cfg =

				teth_bridge_params.skip_ep_cfg;

			d->ipa_params.keep_ipa_awake = true;

		}

		d->ipa_params.dir = USB_TO_PEER_PERIPHERAL;

		if (d->func_type == USB_FUNC_ECM) {

			d->ipa_params.notify = ecm_qc_get_ipa_rx_cb();

			d->ipa_params.priv = ecm_qc_get_ipa_priv();

			d->ipa_params.skip_ep_cfg = ecm_qc_get_skip_ep_config();

			d->ipa_params.keep_ipa_awake = true;

		}



		if (d->func_type == USB_FUNC_RNDIS) {
@@ -747,7 +745,6 @@ static void bam2bam_data_connect_work(struct work_struct *w) 
			d->ipa_params.priv = rndis_qc_get_ipa_priv();

			d->ipa_params.skip_ep_cfg =

				rndis_qc_get_skip_ep_config();

			d->ipa_params.keep_ipa_awake = true;

		}



		/* Support for UL using system-to-IPA */