Commit 18ac3016 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

USB: class: usblp: clean up urb->status usage

This done in anticipation of removal of urb->status, which will make
that patch easier to review and apply in the future.
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 185d4058
...@@ -289,16 +289,17 @@ static int proto_bias = -1; ...@@ -289,16 +289,17 @@ static int proto_bias = -1;
static void usblp_bulk_read(struct urb *urb) static void usblp_bulk_read(struct urb *urb)
{ {
struct usblp *usblp = urb->context; struct usblp *usblp = urb->context;
int status = urb->status;
if (usblp->present && usblp->used) { if (usblp->present && usblp->used) {
if (urb->status) if (status)
printk(KERN_WARNING "usblp%d: " printk(KERN_WARNING "usblp%d: "
"nonzero read bulk status received: %d\n", "nonzero read bulk status received: %d\n",
usblp->minor, urb->status); usblp->minor, status);
} }
spin_lock(&usblp->lock); spin_lock(&usblp->lock);
if (urb->status < 0) if (status < 0)
usblp->rstatus = urb->status; usblp->rstatus = status;
else else
usblp->rstatus = urb->actual_length; usblp->rstatus = urb->actual_length;
usblp->rcomplete = 1; usblp->rcomplete = 1;
...@@ -311,16 +312,17 @@ static void usblp_bulk_read(struct urb *urb) ...@@ -311,16 +312,17 @@ static void usblp_bulk_read(struct urb *urb)
static void usblp_bulk_write(struct urb *urb) static void usblp_bulk_write(struct urb *urb)
{ {
struct usblp *usblp = urb->context; struct usblp *usblp = urb->context;
int status = urb->status;
if (usblp->present && usblp->used) { if (usblp->present && usblp->used) {
if (urb->status) if (status)
printk(KERN_WARNING "usblp%d: " printk(KERN_WARNING "usblp%d: "
"nonzero write bulk status received: %d\n", "nonzero write bulk status received: %d\n",
usblp->minor, urb->status); usblp->minor, status);
} }
spin_lock(&usblp->lock); spin_lock(&usblp->lock);
if (urb->status < 0) if (status < 0)
usblp->wstatus = urb->status; usblp->wstatus = status;
else else
usblp->wstatus = urb->actual_length; usblp->wstatus = urb->actual_length;
usblp->wcomplete = 1; usblp->wcomplete = 1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment