From b338ff9a3f352f09fe316e2fa897bf7fa439ab4a Mon Sep 17 00:00:00 2001
From: Max Vozeler <max@vozeler.com>
Date: Wed, 12 Jan 2011 15:02:03 +0200
Subject: [PATCH] --- yaml --- r: 232608 b: refs/heads/master c:
 7e249c8b0737429bbf534515f81aded93504f449 h: refs/heads/master v: v3

---
 [refs]                                |  2 +-
 trunk/drivers/staging/usbip/vhci_rx.c | 16 ++++++++++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 602e6eaec205..6231e9560863 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6d212153a838354078cc7d96f9bb23b7d1fd3d1b
+refs/heads/master: 7e249c8b0737429bbf534515f81aded93504f449
diff --git a/trunk/drivers/staging/usbip/vhci_rx.c b/trunk/drivers/staging/usbip/vhci_rx.c
index bdbedd256903..ac15cea75396 100644
--- a/trunk/drivers/staging/usbip/vhci_rx.c
+++ b/trunk/drivers/staging/usbip/vhci_rx.c
@@ -205,11 +205,23 @@ static void vhci_rx_pdu(struct usbip_device *ud)
 
 	memset(&pdu, 0, sizeof(pdu));
 
-
 	/* 1. receive a pdu header */
 	ret = usbip_xmit(0, ud->tcp_socket, (char *) &pdu, sizeof(pdu), 0);
+	if (ret < 0) {
+		if (ret == -ECONNRESET)
+			usbip_uinfo("connection reset by peer\n");
+		else if (ret != -ERESTARTSYS)
+			usbip_uinfo("xmit failed %d\n", ret);
+		usbip_event_add(ud, VDEV_EVENT_ERROR_TCP);
+		return;
+	}
+	if (ret == 0) {
+		usbip_uinfo("connection closed");
+		usbip_event_add(ud, VDEV_EVENT_DOWN);
+		return;
+	}
 	if (ret != sizeof(pdu)) {
-		usbip_uerr("receiving pdu failed! size is %d, should be %d\n",
+		usbip_uerr("received pdu size is %d, should be %d\n",
 					ret, (unsigned int)sizeof(pdu));
 		usbip_event_add(ud, VDEV_EVENT_ERROR_TCP);
 		return;