summaryrefslogtreecommitdiffstats
path: root/drivers/usb/usbip
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-11-04 06:41:09 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-11-04 06:41:09 +0100
commit16c8373ecf7b3c723a8e765d798ea413bc8345a6 (patch)
tree19684614078313ac940ce1ad744772dac71b91a6 /drivers/usb/usbip
parentd19f1d44e74322ae2a75dc07b7d44fecacd5bcfb (diff)
parenta99d8080aaf358d5d23581244e5da23b35e340b9 (diff)
downloadlinux-16c8373ecf7b3c723a8e765d798ea413bc8345a6.tar.bz2
Merge 5.4-rc6 into usb-next
We need the USB fixes in here to build on top of. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/usbip')
-rw-r--r--drivers/usb/usbip/vhci_tx.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/usb/usbip/vhci_tx.c b/drivers/usb/usbip/vhci_tx.c
index c3803785f6ef..0ae40a13a9fe 100644
--- a/drivers/usb/usbip/vhci_tx.c
+++ b/drivers/usb/usbip/vhci_tx.c
@@ -147,7 +147,10 @@ static int vhci_send_cmd_submit(struct vhci_device *vdev)
}
kfree(iov);
+ /* This is only for isochronous case */
kfree(iso_buffer);
+ iso_buffer = NULL;
+
usbip_dbg_vhci_tx("send txdata\n");
total_size += txsize;