Skip to content

Commit

Permalink
NFC: pn533: Fix urb->status handling
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Waldemar Rymarkiewicz authored and Samuel Ortiz committed Jan 9, 2013
1 parent 89fb202 commit f8f9917
Showing 1 changed file with 18 additions and 16 deletions.
34 changes: 18 additions & 16 deletions drivers/nfc/pn533.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down Expand Up @@ -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;
}
Expand Down Expand Up @@ -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);
}
}

Expand Down

0 comments on commit f8f9917

Please sign in to comment.