Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

USB: misc: ldusb: 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: Greg Kroah-Hartman <gregkh@suse.de>

+11 -9
+11 -9
drivers/usb/misc/ldusb.c
··· 219 219 struct ld_usb *dev = urb->context; 220 220 size_t *actual_buffer; 221 221 unsigned int next_ring_head; 222 + int status = urb->status; 222 223 int retval; 223 224 224 - if (urb->status) { 225 - if (urb->status == -ENOENT || 226 - urb->status == -ECONNRESET || 227 - urb->status == -ESHUTDOWN) { 225 + if (status) { 226 + if (status == -ENOENT || 227 + status == -ECONNRESET || 228 + status == -ESHUTDOWN) { 228 229 goto exit; 229 230 } else { 230 231 dbg_info(&dev->intf->dev, "%s: nonzero status received: %d\n", 231 - __FUNCTION__, urb->status); 232 + __FUNCTION__, status); 232 233 spin_lock(&dev->rbsl); 233 234 goto resubmit; /* maybe we can recover */ 234 235 } ··· 276 275 static void ld_usb_interrupt_out_callback(struct urb *urb) 277 276 { 278 277 struct ld_usb *dev = urb->context; 278 + int status = urb->status; 279 279 280 280 /* sync/async unlink faults aren't errors */ 281 - if (urb->status && !(urb->status == -ENOENT || 282 - urb->status == -ECONNRESET || 283 - urb->status == -ESHUTDOWN)) 281 + if (status && !(status == -ENOENT || 282 + status == -ECONNRESET || 283 + status == -ESHUTDOWN)) 284 284 dbg_info(&dev->intf->dev, 285 285 "%s - nonzero write interrupt status received: %d\n", 286 - __FUNCTION__, urb->status); 286 + __FUNCTION__, status); 287 287 288 288 dev->interrupt_out_busy = 0; 289 289 wake_up_interruptible(&dev->write_wait);