]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commitdiff
NFC: pn533: Fix urb->status handling
authorWaldemar Rymarkiewicz <waldemar.rymarkiewicz@tieto.com>
Mon, 10 Dec 2012 13:42:54 +0000 (14:42 +0100)
committerSamuel Ortiz <sameo@linux.intel.com>
Wed, 9 Jan 2013 23:51:41 +0000 (00:51 +0100)
Fix text message to be more suitable for the error code and treat
ESHUTDOWN as an error not debug msg.

Signed-off-by: Waldemar Rymarkiewicz <waldemar.rymarkiewicz@tieto.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
drivers/nfc/pn533.c

index d17ec6a664a0174fe82bc18e6f2d6d90ae225e26..898375d95f365e9f1344c2ce103ea2ae4612c3a0 100644 (file)
@@ -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);
        }
 }