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

Commit 521b85ae authored by Jim Radford's avatar Jim Radford Committed by Greg Kroah-Hartman
Browse files

USB: fix usb-serial regression 



This patch reverts d9a7ecac since it
breaks drivers that need to access the ->port[] array in shutdown
(most of them).

Signed-Off: Jim Radford <radford@blackbean.org>
Acked-by: default avatarMark Lord <mlord@pobox.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 5851fadc

drivers/usb/serial/usb-serial.c

+5 −6
Original line number Diff line number Diff line
@@ -138,6 +138,11 @@ static void destroy_serial(struct kref *kref) 


	dbg("%s - %s", __FUNCTION__, serial->type->description);



	serial->type->shutdown(serial);



	/* return the minor range that this device had */

	return_serial(serial);



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

		serial->port[i]->open_count = 0;
@@ -148,12 +153,6 @@ static void destroy_serial(struct kref *kref) 
			serial->port[i] = NULL;

		}



	if (serial->type->shutdown)

		serial->type->shutdown(serial);



	/* return the minor range that this device had */

	return_serial(serial);



	/* If this is a "fake" port, we have to clean it up here, as it will

	 * not get cleaned up in port_release() as it was never registered with

	 * the driver core */