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

Commit 81e5b23c authored by Oliver Neukum's avatar Oliver Neukum Committed by Greg Kroah-Hartman
Browse files

USB: fix wrong order of events in usb serial suspension 



if a subdriver has an additional suspend method, it must be called
first to allow the subdriver to return -EBUSY, because the second
half cannot be easily undone.

Signed-off-by: default avatarOliver Neukum <oliver@neukum.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 807fcb5e

drivers/usb/serial/usb-serial.c

+7 −3
Original line number Diff line number Diff line
@@ -1157,15 +1157,19 @@ int usb_serial_suspend(struct usb_interface *intf, pm_message_t message) 


	serial->suspending = 1;



	if (serial->type->suspend) {

		r = serial->type->suspend(serial, message);

		if (r < 0)

			goto err_out;

	}



	for (i = 0; i < serial->num_ports; ++i) {

		port = serial->port[i];

		if (port)

			kill_traffic(port);

	}



	if (serial->type->suspend)

		r = serial->type->suspend(serial, message);



err_out:

	return r;

}

EXPORT_SYMBOL(usb_serial_suspend);