Commit cf4df407 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

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

This reverts commit 32fd87b3.

Alan wrote a better fix for this...

Cc: Andrey Konovalov <andreyknvl@google.com>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 32fd87b3
...@@ -764,21 +764,18 @@ void usb_destroy_configuration(struct usb_device *dev) ...@@ -764,21 +764,18 @@ void usb_destroy_configuration(struct usb_device *dev)
return; return;
if (dev->rawdescriptors) { if (dev->rawdescriptors) {
for (i = 0; i < dev->descriptor.bNumConfigurations && for (i = 0; i < dev->descriptor.bNumConfigurations; i++)
i < USB_MAXCONFIG; i++)
kfree(dev->rawdescriptors[i]); kfree(dev->rawdescriptors[i]);
kfree(dev->rawdescriptors); kfree(dev->rawdescriptors);
dev->rawdescriptors = NULL; dev->rawdescriptors = NULL;
} }
for (c = 0; c < dev->descriptor.bNumConfigurations && for (c = 0; c < dev->descriptor.bNumConfigurations; c++) {
c < USB_MAXCONFIG; c++) {
struct usb_host_config *cf = &dev->config[c]; struct usb_host_config *cf = &dev->config[c];
kfree(cf->string); kfree(cf->string);
for (i = 0; i < cf->desc.bNumInterfaces && for (i = 0; i < cf->desc.bNumInterfaces; i++) {
i < USB_MAXINTERFACES; i++) {
if (cf->intf_cache[i]) if (cf->intf_cache[i])
kref_put(&cf->intf_cache[i]->ref, kref_put(&cf->intf_cache[i]->ref,
usb_release_interface_cache); usb_release_interface_cache);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment