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

Commit 52e55af2 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: f_mass_storage: Allow USB LPM upon ep disable"

parents e5a5057b 82f29356

drivers/usb/gadget/function/f_mass_storage.c

+7 −1
Original line number Diff line number Diff line
@@ -2289,8 +2289,11 @@ reset: 
	}



	common->running = 0;

	if (!new_fsg || rc)

	if (!new_fsg || rc) {

		/* allow usb LPM after eps are disabled */

		usb_gadget_autopm_put_async(common->gadget);

		return rc;

	}



	common->fsg = new_fsg;

	fsg = common->fsg;
@@ -2333,6 +2336,9 @@ reset: 
		bh->outreq->complete = bulk_out_complete;

	}



	/* prevents usb LPM until thread runs to completion */

	usb_gadget_autopm_get_noresume(common->gadget);



	common->running = 1;

	for (i = 0; i < ARRAY_SIZE(common->luns); ++i)

		if (common->luns[i])