diff options
author | Alex Shi <alex.shi@linaro.org> | 2018-02-22 10:16:59 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2018-02-22 10:16:59 +0800 |
commit | f7901365aa48b20b25f8402e0fd1eea4ac6c55e7 (patch) | |
tree | 4cab2d6b92324c06a457c43a5c8bac55581cdfb5 /drivers/usb/usbip/stub_dev.c | |
parent | cd1fe2006b62234455a91e428bad45331dc79250 (diff) | |
parent | 701115b70ba8e8b20c6cfe689db4c1dd6af3ece9 (diff) |
Merge remote-tracking branch 'rt-stable/v4.4-rt' into linux-linaro-lsk-v4.4-rt
Conflicts:
arch/x86/Kconfig
Diffstat (limited to 'drivers/usb/usbip/stub_dev.c')
-rw-r--r-- | drivers/usb/usbip/stub_dev.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/usb/usbip/stub_dev.c b/drivers/usb/usbip/stub_dev.c index a3ec49bdc1e6..ec38370ffcab 100644 --- a/drivers/usb/usbip/stub_dev.c +++ b/drivers/usb/usbip/stub_dev.c @@ -163,8 +163,7 @@ static void stub_shutdown_connection(struct usbip_device *ud) * step 1? */ if (ud->tcp_socket) { - dev_dbg(&sdev->udev->dev, "shutdown tcp_socket %p\n", - ud->tcp_socket); + dev_dbg(&sdev->udev->dev, "shutdown sockfd %d\n", ud->sockfd); kernel_sock_shutdown(ud->tcp_socket, SHUT_RDWR); } |