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

Commit 12857698 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_data: Bail out from disconnect_w if connect pending"

parents bfaebf7a 3b8635c8

drivers/usb/gadget/function/u_bam_data.c

+8 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2012-2017, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-2018, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -775,6 +775,13 @@ static void bam2bam_data_disconnect_work(struct work_struct *w) 
		return;

	}



	if (port->last_event == U_BAM_DATA_CONNECT_E) {

		pr_debug("%s: Port is about to connect. Bail out.\n",

			__func__);

		spin_unlock_irqrestore(&port->port_lock, flags);

		return;

	}



	d = &port->data_ch;



	/*