summaryrefslogtreecommitdiffstats
path: root/drivers/usb/misc
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-06-29 08:22:27 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-06-29 08:22:27 +0200
commit9cf6ffae380061b16b2b4269d4f2e1a50aa2508a (patch)
treeff03f182b1386e614fac1b3c58c3c5f1a2d51062 /drivers/usb/misc
parentb3a5ce874c2619c9b8a6c5bbcfefdb95e0227600 (diff)
parent9ebcfadb0610322ac537dd7aa5d9cbc2b2894c68 (diff)
downloadlinux-9cf6ffae380061b16b2b4269d4f2e1a50aa2508a.tar.bz2
Merge 5.8-rc3 into usb-next
We want the USB fixes in here, and this resolves a merge issue found in linux-next. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/misc')
-rw-r--r--drivers/usb/misc/usbtest.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/misc/usbtest.c b/drivers/usb/misc/usbtest.c
index 98ada1a3425c..bae88893ee8e 100644
--- a/drivers/usb/misc/usbtest.c
+++ b/drivers/usb/misc/usbtest.c
@@ -2873,6 +2873,7 @@ static void usbtest_disconnect(struct usb_interface *intf)
usb_set_intfdata(intf, NULL);
dev_dbg(&intf->dev, "disconnect\n");
+ kfree(dev->buf);
kfree(dev);
}