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

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

USB: serial: introduce a flag into the usb serial layer to tell drivers that... 


USB: serial: introduce a flag into the usb serial layer to tell drivers that their URBs are killed due to suspension

This patch introduces a flag into the usb serial layer to tell drivers
that their URBs are killed due to suspension. That is necessary to let
drivers know whether they should report an error back.

Signed-off-by: default avatarOliver Neukum <oneukum@suse.de>

Hi Greg,

this is for 2.6.30. Patches to use this in drivers are under development.

	Regards
		Oliver
parent 6e14bda1

drivers/usb/serial/usb-serial.c

+4 −0
Original line number Diff line number Diff line
@@ -1067,6 +1067,8 @@ int usb_serial_suspend(struct usb_interface *intf, pm_message_t message) 
	struct usb_serial_port *port;

	int i, r = 0;



	serial->suspending = 1;



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

		port = serial->port[i];

		if (port)
@@ -1084,8 +1086,10 @@ int usb_serial_resume(struct usb_interface *intf) 
{

	struct usb_serial *serial = usb_get_intfdata(intf);



	serial->suspending = 0;

	if (serial->type->resume)

		return serial->type->resume(serial);



	return 0;

}

EXPORT_SYMBOL(usb_serial_resume);

include/linux/usb/serial.h

+2 −1
Original line number Diff line number Diff line
@@ -130,7 +130,8 @@ struct usb_serial { 
	struct usb_device		*dev;

	struct usb_serial_driver	*type;

	struct usb_interface		*interface;

	unsigned char			disconnected;

	unsigned char			disconnected:1;

	unsigned char			suspending:1;

	unsigned char			minor;

	unsigned char			num_ports;

	unsigned char			num_port_pointers;