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

Commit da033616 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "USB: core: only clean up what we allocated"

parents 0063466d 29db623f

drivers/usb/core/config.c

+6 −3
Original line number Diff line number Diff line
@@ -768,18 +768,21 @@ void usb_destroy_configuration(struct usb_device *dev) 
		return;



	if (dev->rawdescriptors) {

		for (i = 0; i < dev->descriptor.bNumConfigurations; i++)

		for (i = 0; i < dev->descriptor.bNumConfigurations &&

				i < USB_MAXCONFIG; i++)

			kfree(dev->rawdescriptors[i]);



		kfree(dev->rawdescriptors);

		dev->rawdescriptors = NULL;

	}



	for (c = 0; c < dev->descriptor.bNumConfigurations; c++) {

	for (c = 0; c < dev->descriptor.bNumConfigurations &&

			c < USB_MAXCONFIG; c++) {

		struct usb_host_config *cf = &dev->config[c];



		kfree(cf->string);

		for (i = 0; i < cf->desc.bNumInterfaces; i++) {

		for (i = 0; i < cf->desc.bNumInterfaces &&

				i < USB_MAXINTERFACES; i++) {

			if (cf->intf_cache[i])

				kref_put(&cf->intf_cache[i]->ref,

					  usb_release_interface_cache);