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

Commit ac7c4c33 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: Fix BUG: scheduling while atomic"

parents c6be2bc4 899a960b

drivers/usb/gadget/u_bam.c

+3 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2011-2014, Linux Foundation. All rights reserved.

/* Copyright (c) 2011-2015, 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
@@ -1641,7 +1641,9 @@ static void gbam2bam_resume_work(struct work_struct *w) 
				configure_data_fifo(d->dst_bam_idx,

					port->port_usb->in,

					d->dst_pipe_type);

				spin_unlock_irqrestore(&port->port_lock, flags);

				msm_dwc3_reset_dbm_ep(port->port_usb->in);

				spin_lock_irqsave(&port->port_lock, flags);

		}

		usb_bam_resume(&d->ipa_params);

	}

drivers/usb/gadget/u_bam_data.c

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

/* Copyright (c) 2012-2015, 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
@@ -2008,7 +2008,9 @@ static void bam2bam_data_resume_work(struct work_struct *w) 
				configure_usb_data_fifo(d->dst_bam_idx,

					port->port_usb->in,

					d->dst_pipe_type);

				spin_unlock_irqrestore(&port->port_lock, flags);

				msm_dwc3_reset_dbm_ep(port->port_usb->in);

				spin_lock_irqsave(&port->port_lock, flags);

		}

		usb_bam_resume(&d->ipa_params);

	}

drivers/usb/gadget/u_data_ipa.c

+3 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2014, The Linux Foundation. All rights reserved.

/* Copyright (c) 2014-2015, 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
@@ -720,7 +720,9 @@ void ipa_data_resume(struct gadget_ipa_port *gp, u8 port_num) 
	if (msm_dwc3_reset_ep_after_lpm(gadget)) {

		configure_fifo(port->src_bam_idx, port->port_usb->out);

		configure_fifo(port->dst_bam_idx, port->port_usb->in);

		spin_unlock_irqrestore(&port->port_lock, flags);

		msm_dwc3_reset_dbm_ep(port->port_usb->in);

		spin_lock_irqsave(&port->port_lock, flags);

		usb_bam_resume(&port->ipa_params);

	}