---

yaml --- r: 351894 b: refs/heads/master c: f8f9917 h: refs/heads/master v: v3
git-mirror · Jan 9, 2013 · 20a5216 · 20a5216
1 parent 42bd3c5
commit 20a5216
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 17 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 89fb20256725e735601ea6439680956fa2ec4741
+refs/heads/master: f8f991710b580878c88cfe49d918cfb0c9e15236
diff --git a/trunk/drivers/nfc/pn533.c b/trunk/drivers/nfc/pn533.c
@@ -505,18 +505,19 @@ static void pn533_recv_response(struct urb *urb)
 
 	switch (urb->status) {
 	case 0:
-		/* success */
-		break;
+		break; /* success */
 	case -ECONNRESET:
 	case -ENOENT:
-	case -ESHUTDOWN:
 		nfc_dev_dbg(&dev->interface->dev,
-			    "Urb shutting down with status: %d", urb->status);
+			    "The urb has been canceled (status %d)",
+			    urb->status);
 		dev->wq_in_error = urb->status;
 		goto sched_wq;
+		break;
+	case -ESHUTDOWN:
 	default:
 		nfc_dev_err(&dev->interface->dev,
-			    "Nonzero urb status received: %d", urb->status);
+			    "Urb failure (status %d)", urb->status);
 		dev->wq_in_error = urb->status;
 		goto sched_wq;
 	}
@@ -562,18 +563,19 @@ static void pn533_recv_ack(struct urb *urb)
 
 	switch (urb->status) {
 	case 0:
-		/* success */
-		break;
+		break; /* success */
 	case -ECONNRESET:
 	case -ENOENT:
-	case -ESHUTDOWN:
 		nfc_dev_dbg(&dev->interface->dev,
-			    "Urb shutting down with status: %d", urb->status);
+			    "The urb has been stopped (status %d)",
+			    urb->status);
 		dev->wq_in_error = urb->status;
 		goto sched_wq;
+		break;
+	case -ESHUTDOWN:
 	default:
 		nfc_dev_err(&dev->interface->dev,
-			    "Nonzero urb status received: %d", urb->status);
+			    "Urb failure (status %d)", urb->status);
 		dev->wq_in_error = urb->status;
 		goto sched_wq;
 	}
@@ -981,17 +983,17 @@ static void pn533_send_complete(struct urb *urb)
 
 	switch (urb->status) {
 	case 0:
-		/* success */
-		break;
+		break; /* success */
 	case -ECONNRESET:
 	case -ENOENT:
-	case -ESHUTDOWN:
 		nfc_dev_dbg(&dev->interface->dev,
-			    "Urb shutting down with status: %d", urb->status);
+			    "The urb has been stopped (status %d)",
+			    urb->status);
 		break;
+	case -ESHUTDOWN:
 	default:
-		nfc_dev_dbg(&dev->interface->dev,
-			    "Nonzero urb status received: %d", urb->status);
+		nfc_dev_err(&dev->interface->dev,
+			    "Urb failure (status %d)", urb->status);
 	}
 }